diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp index ae71c0052..4344397c7 100644 --- a/apps/openmw/mwsound/ffmpeg_decoder.hpp +++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp @@ -42,6 +42,9 @@ namespace MWSound virtual void readAll(std::vector &output); virtual void rewind(); + FFmpeg_Decoder& operator=(const FFmpeg_Decoder &rhs); + FFmpeg_Decoder(const FFmpeg_Decoder &rhs); + FFmpeg_Decoder(); public: virtual ~FFmpeg_Decoder(); diff --git a/apps/openmw/mwsound/mpgsnd_decoder.hpp b/apps/openmw/mwsound/mpgsnd_decoder.hpp index 1d9e9d5e2..870773edc 100644 --- a/apps/openmw/mwsound/mpgsnd_decoder.hpp +++ b/apps/openmw/mwsound/mpgsnd_decoder.hpp @@ -40,6 +40,9 @@ namespace MWSound virtual void readAll(std::vector &output); virtual void rewind(); + MpgSnd_Decoder& operator=(const MpgSnd_Decoder &rhs); + MpgSnd_Decoder(const MpgSnd_Decoder &rhs); + MpgSnd_Decoder(); public: virtual ~MpgSnd_Decoder(); diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp index 5e61cb94f..a0b9c3a72 100644 --- a/apps/openmw/mwsound/openal_output.cpp +++ b/apps/openmw/mwsound/openal_output.cpp @@ -76,6 +76,9 @@ class OpenAL_SoundStream : public Sound volatile bool mIsFinished; + OpenAL_SoundStream(const OpenAL_SoundStream &rhs); + OpenAL_SoundStream& operator=(const OpenAL_SoundStream &rhs); + public: OpenAL_SoundStream(OpenAL_Output &output, ALuint src, DecoderPtr decoder); virtual ~OpenAL_SoundStream(); @@ -148,6 +151,10 @@ struct OpenAL_Output::StreamThread { mStreams.clear(); mMutex.unlock(); } + +private: + StreamThread(const StreamThread &rhs); + StreamThread& operator=(const StreamThread &rhs); }; @@ -308,6 +315,10 @@ class OpenAL_Sound : public Sound ALuint mSource; ALuint mBuffer; + + OpenAL_Sound(const OpenAL_Sound &rhs); + OpenAL_Sound& operator=(const OpenAL_Sound &rhs); + public: OpenAL_Sound(OpenAL_Output &output, ALuint src, ALuint buf); virtual ~OpenAL_Sound(); diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp index 33ab7a2aa..e8154e906 100644 --- a/apps/openmw/mwsound/openal_output.hpp +++ b/apps/openmw/mwsound/openal_output.hpp @@ -52,6 +52,9 @@ namespace MWSound virtual void updateListener(const float *pos, const float *atdir, const float *updir); + OpenAL_Output& operator=(const OpenAL_Output &rhs); + OpenAL_Output(const OpenAL_Output &rhs); + OpenAL_Output(SoundManager &mgr); virtual ~OpenAL_Output(); diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp index 84725464b..f9e7ab427 100644 --- a/apps/openmw/mwsound/sound.hpp +++ b/apps/openmw/mwsound/sound.hpp @@ -9,7 +9,11 @@ namespace MWSound virtual bool isPlaying() = 0; virtual void update(const float *pos) = 0; + Sound& operator=(const Sound &rhs); + Sound(const Sound &rhs); + public: + Sound() { } virtual ~Sound() { } friend class OpenAL_Output; diff --git a/apps/openmw/mwsound/sound_decoder.hpp b/apps/openmw/mwsound/sound_decoder.hpp index e076c7b56..9c28d5ff5 100644 --- a/apps/openmw/mwsound/sound_decoder.hpp +++ b/apps/openmw/mwsound/sound_decoder.hpp @@ -38,6 +38,10 @@ namespace MWSound Sound_Decoder() : mResourceMgr(Ogre::ResourceGroupManager::getSingleton()) { } virtual ~Sound_Decoder() { } + + private: + Sound_Decoder(const Sound_Decoder &rhs); + Sound_Decoder& operator=(const Sound_Decoder &rhs); }; } diff --git a/apps/openmw/mwsound/sound_output.hpp b/apps/openmw/mwsound/sound_output.hpp index 14b61e609..1722165e4 100644 --- a/apps/openmw/mwsound/sound_output.hpp +++ b/apps/openmw/mwsound/sound_output.hpp @@ -29,6 +29,9 @@ namespace MWSound virtual void updateListener(const float *pos, const float *atdir, const float *updir) = 0; + Sound_Output& operator=(const Sound_Output &rhs); + Sound_Output(const Sound_Output &rhs); + Sound_Output(SoundManager &mgr) : mManager(mgr) { } public: virtual ~Sound_Output() { } diff --git a/apps/openmw/mwsound/soundmanager.hpp b/apps/openmw/mwsound/soundmanager.hpp index aef4a8ace..b7c883a13 100644 --- a/apps/openmw/mwsound/soundmanager.hpp +++ b/apps/openmw/mwsound/soundmanager.hpp @@ -53,6 +53,9 @@ namespace MWSound void updateSounds(float duration); void updateRegionSound(float duration); + SoundManager(const SoundManager &rhs); + SoundManager& operator=(const SoundManager &rhs); + protected: DecoderPtr getDecoder(); friend class OpenAL_Output;