mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 21:45:33 +00:00
Code Issues Releases Wiki Activity

Add some dummy copy constructors and assignment operators to prevent implicit versions from being used

Browse source
This commit is contained in:
Chris Robinson 2012-03-24 03:49:03 -07:00
parent fa70a72b75
commit 5cb90ab704
8 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,9 @@ namespace MWSound
virtual void readAll(std::vector<char> &output);
virtual void rewind();
FFmpeg_Decoder& operator=(const FFmpeg_Decoder &rhs);
FFmpeg_Decoder(const FFmpeg_Decoder &rhs);
FFmpeg_Decoder();
public:
virtual ~FFmpeg_Decoder();

3
apps/openmw/mwsound/mpgsnd_decoder.hpp
View file

@ -40,6 +40,9 @@ namespace MWSound
virtual void readAll(std::vector<char> &output);
virtual void rewind();
MpgSnd_Decoder& operator=(const MpgSnd_Decoder &rhs);
MpgSnd_Decoder(const MpgSnd_Decoder &rhs);
MpgSnd_Decoder();
public:
virtual ~MpgSnd_Decoder();

11
apps/openmw/mwsound/openal_output.cpp
View file

@ -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();

3
apps/openmw/mwsound/openal_output.hpp
View file

@ -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();

4
apps/openmw/mwsound/sound.hpp
View file

@ -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;

4
apps/openmw/mwsound/sound_decoder.hpp
View file

@ -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);
};
}

3
apps/openmw/mwsound/sound_output.hpp
View file

@ -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() { }

3
apps/openmw/mwsound/soundmanager.hpp
View file

@ -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;