From e30a59772c6d18f1953b0e4b6afc55be439e7c04 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 8 Jan 2021 22:18:37 +0100
Subject: [PATCH] Remove DEFAULT_DECODER macros

---
 apps/openmw/mwsound/ffmpeg_decoder.hpp  | 6 ++----
 apps/openmw/mwsound/soundmanagerimp.cpp | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index 92d046d85f..f099c831ca 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -69,15 +69,13 @@ namespace MWSound
         FFmpeg_Decoder& operator=(const FFmpeg_Decoder &rhs);
         FFmpeg_Decoder(const FFmpeg_Decoder &rhs);
 
-        FFmpeg_Decoder(const VFS::Manager* vfs);
     public:
+        explicit FFmpeg_Decoder(const VFS::Manager* vfs);
+
         virtual ~FFmpeg_Decoder();
 
         friend class SoundManager;
     };
-#ifndef DEFAULT_DECODER
-#define DEFAULT_DECODER (::MWSound::FFmpeg_Decoder)
-#endif
 }
 
 #endif
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 44465e5a76..740167b0ac 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -117,7 +117,7 @@ namespace MWSound
     // Return a new decoder instance, used as needed by the output implementations
     DecoderPtr SoundManager::getDecoder()
     {
-        return DecoderPtr(new DEFAULT_DECODER (mVFS));
+        return std::make_shared<FFmpeg_Decoder>(mVFS);
     }
 
     DecoderPtr SoundManager::loadVoice(const std::string &voicefile)