mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Make Sound and Stream sibling types

Browse Source 
To avoid being able to accidentally cast a Stream* to a Sound*, or vice-versa.
This commit is contained in:
Chris Robinson 2017-09-12 01:19:26 -07:00
parent 9e45f6d05f
commit 617c05f557
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/openmw/mwsound/sound.hpp
View File

@ -7,9 +7,10 @@
namespace MWSound
{
class Sound {
Sound& operator=(const Sound &rhs);
Sound(const Sound &rhs);
class SoundBase {
SoundBase& operator=(const SoundBase&) = delete;
SoundBase(const SoundBase&) = delete;
SoundBase(SoundBase&&) = delete;
osg::Vec3f mPos;
float mVolume; /* NOTE: Real volume = mVolume*mBaseVolume */
@ -80,17 +81,26 @@ namespace MWSound
mHandle = nullptr;
}
Sound()
SoundBase()
: mPos(0.0f, 0.0f, 0.0f), mVolume(1.0f), mBaseVolume(1.0f), mPitch(1.0f)
, mMinDistance(1.0f), mMaxDistance(1000.0f), mFlags(0), mFadeOutTime(0.0f)
, mHandle(0)
, mHandle(nullptr)
{ }
};
// Same as above, but it's a different type since the output handles them differently
class Stream : public Sound {
Stream& operator=(const Stream &rhs);
Stream(const Stream &rhs);
class Sound : public SoundBase {
Sound& operator=(const Sound&) = delete;
Sound(const Sound&) = delete;
Sound(Sound&&) = delete;
public:
Sound() { }
};
class Stream : public SoundBase {
Stream& operator=(const Stream&) = delete;
Stream(const Stream&) = delete;
Stream(Stream&&) = delete;
public:
Stream() { }