Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Let the OGG function overrides handle freeing memory of the FileStream pointer.

This commit is contained in:
rh101 2021-04-26 17:30:18 +10:00
parent 6f47d44b81
commit c7aa1d4f00
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/audio/include/AudioDecoderOgg.h
View File

@ -69,7 +69,6 @@ protected:
AudioDecoderOgg();
~AudioDecoderOgg();
std::unique_ptr<FileStream> _fileStream{};
OggVorbis_File _vf;
friend class AudioDecoderManager;

11
cocos/audio/src/AudioDecoderOgg.cpp
View File

@ -56,6 +56,8 @@ namespace cocos2d {
}
static int ov_fclose_r(void* handle) {
auto* fs = static_cast<FileStream*>(handle);
delete fs;
return 0;
}
@ -70,8 +72,8 @@ namespace cocos2d {
bool AudioDecoderOgg::open(const std::string& fullPath)
{
_fileStream = FileUtils::getInstance()->openFileStream(fullPath, FileStream::Mode::READ);
if (!_fileStream)
auto fs = FileUtils::getInstance()->openFileStream(fullPath, FileStream::Mode::READ).release();
if (!fs)
{
ALOGE("Trouble with ogg(1): %s\n", strerror(errno));
return false;
@ -83,8 +85,8 @@ namespace cocos2d {
ov_fclose_r,
ov_ftell_r
};
if (0 == ov_open_callbacks(_fileStream.get(), &_vf, nullptr, 0, OV_CALLBACKS_POSIX))
if (0 == ov_open_callbacks(fs, &_vf, nullptr, 0, OV_CALLBACKS_POSIX))
{
// header
vorbis_info* vi = ov_info(&_vf, -1);
@ -104,7 +106,6 @@ namespace cocos2d {
{
ov_clear(&_vf);
_isOpened = false;
_fileStream.reset();
}
}