mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-05 22:45:33 +00:00
Code Issues Releases Wiki Activity

Remove DEFAULT_DECODER macros

Browse source
This commit is contained in:
elsid 2021-01-08 22:18:37 +01:00
parent 4db2f79a3c
commit e30a59772c
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwsound/ffmpeg_decoder.hpp
View file

@ -69,15 +69,13 @@ namespace MWSound
FFmpeg_Decoder& operator=(const FFmpeg_Decoder &rhs); FFmpeg_Decoder& operator=(const FFmpeg_Decoder &rhs);
FFmpeg_Decoder(const FFmpeg_Decoder &rhs); FFmpeg_Decoder(const FFmpeg_Decoder &rhs);
FFmpeg_Decoder(const VFS::Manager* vfs);
public: public:
explicit FFmpeg_Decoder(const VFS::Manager* vfs);
virtual ~FFmpeg_Decoder(); virtual ~FFmpeg_Decoder();
friend class SoundManager; friend class SoundManager;
}; };
#ifndef DEFAULT_DECODER
#define DEFAULT_DECODER (::MWSound::FFmpeg_Decoder)
#endif
} }
#endif #endif

2
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -117,7 +117,7 @@ namespace MWSound
// Return a new decoder instance, used as needed by the output implementations // Return a new decoder instance, used as needed by the output implementations
DecoderPtr SoundManager::getDecoder() DecoderPtr SoundManager::getDecoder()
{ {
return DecoderPtr(new DEFAULT_DECODER (mVFS)); return std::make_shared<FFmpeg_Decoder>(mVFS);
} }
DecoderPtr SoundManager::loadVoice(const std::string &voicefile) DecoderPtr SoundManager::loadVoice(const std::string &voicefile)