miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Add AutoRelease helper to use function as unique_ptr deleter. (#14353)

Browse Source 
This allows passing the function as a template parameter instead of requiring a custom deleter functor.
This commit is contained in:
Peter Nelson
2025-06-11 20:13:49 +01:00
committed by GitHub
parent f8776b0a6f
commit 9c16603da6
4 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/soundloader_opus.cpp
View File

@@ -8,6 +8,8 @@
/** @file sound_opus.cpp Loading of opus sounds. */
#include "stdafx.h"
#include "misc/autorelease.hpp"
#include "random_access_file_type.h"
#include "sound_type.h"
#include "soundloader_type.h"
@@ -51,7 +53,7 @@ public:
sound.file->ReadBlock(tmp.data(), tmp.size());
int error = 0;
auto of = std::unique_ptr<OggOpusFile, OggOpusFileDeleter>(op_open_memory(tmp.data(), tmp.size(), &error));
auto of = AutoRelease<OggOpusFile, op_free>(op_open_memory(tmp.data(), tmp.size(), &error));
if (error != 0) return false;
size_t datapos = 0;
@@ -81,15 +83,6 @@ public:
return true;
}
private:
/** Helper class to RAII release an OggOpusFile. */
struct OggOpusFileDeleter {
void operator()(OggOpusFile *of)
{
if (of != nullptr) op_free(of);
}
};
};
static SoundLoader_Opus s_sound_loader_opus;