diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp index 685979bcfd..87667019e1 100644 --- a/apps/openmw/mwsound/openal_output.cpp +++ b/apps/openmw/mwsound/openal_output.cpp @@ -188,7 +188,7 @@ public: virtual void stop(); virtual bool isPlaying(); virtual double getTimeOffset(); - virtual void update(); + virtual void applyUpdates(); void play(); bool process(); @@ -206,7 +206,7 @@ public: : OpenAL_SoundStream(output, src, decoder, pos, vol, basevol, pitch, mindist, maxdist, flags) { } - virtual void update(); + virtual void applyUpdates(); }; @@ -411,10 +411,10 @@ void OpenAL_SoundStream::updateAll(bool local) } alSourcei(mSource, AL_LOOPING, AL_FALSE); - update(); + applyUpdates(); } -void OpenAL_SoundStream::update() +void OpenAL_SoundStream::applyUpdates() { ALfloat gain = mVolume*mBaseVolume; ALfloat pitch = mPitch; @@ -490,7 +490,7 @@ ALint OpenAL_SoundStream::refillQueue() return queued; } -void OpenAL_SoundStream3D::update() +void OpenAL_SoundStream3D::applyUpdates() { ALfloat gain = mVolume*mBaseVolume; ALfloat pitch = mPitch; @@ -536,7 +536,7 @@ public: virtual void stop(); virtual bool isPlaying(); virtual double getTimeOffset(); - virtual void update(); + virtual void applyUpdates(); }; // @@ -552,7 +552,7 @@ public: : OpenAL_Sound(output, src, pos, vol, basevol, pitch, mindist, maxdist, flags) { } - virtual void update(); + virtual void applyUpdates(); }; OpenAL_Sound::OpenAL_Sound(OpenAL_Output &output, ALuint src, const osg::Vec3f& pos, float vol, float basevol, float pitch, float mindist, float maxdist, int flags) @@ -614,10 +614,10 @@ void OpenAL_Sound::updateAll(bool local) } alSourcei(mSource, AL_LOOPING, (mFlags&MWBase::SoundManager::Play_Loop) ? AL_TRUE : AL_FALSE); - update(); + applyUpdates(); } -void OpenAL_Sound::update() +void OpenAL_Sound::applyUpdates() { ALfloat gain = mVolume*mBaseVolume; ALfloat pitch = mPitch; @@ -636,7 +636,7 @@ void OpenAL_Sound::update() throwALerror(); } -void OpenAL_Sound3D::update() +void OpenAL_Sound3D::applyUpdates() { ALfloat gain = mVolume*mBaseVolume; ALfloat pitch = mPitch; diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp index 8ef1d25dbb..944fbc0327 100644 --- a/apps/openmw/mwsound/sound.hpp +++ b/apps/openmw/mwsound/sound.hpp @@ -25,7 +25,7 @@ namespace MWSound virtual void stop() = 0; virtual bool isPlaying() = 0; virtual double getTimeOffset() = 0; - virtual void update() = 0; + virtual void applyUpdates() = 0; void setPosition(const osg::Vec3f &pos) { mPos = pos; } void setVolume(float volume) { mVolume = volume; } void setBaseVolume(float volume) { mBaseVolume = volume; } diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp index d08aa4ca01..b31ae90197 100644 --- a/apps/openmw/mwsound/soundmanagerimp.cpp +++ b/apps/openmw/mwsound/soundmanagerimp.cpp @@ -863,7 +863,7 @@ namespace MWSound sound->updateFade(duration); - sound->update(); + sound->applyUpdates(); return true; } @@ -901,7 +901,7 @@ namespace MWSound { MWBase::SoundPtr sound = sndidx->first; sound->setBaseVolume(volumeFromType(sound->getPlayType())); - sound->update(); + sound->applyUpdates(); } } SaySoundMap::iterator sayiter = mActiveSaySounds.begin(); @@ -909,12 +909,12 @@ namespace MWSound { MWBase::SoundPtr sound = sayiter->second.first; sound->setBaseVolume(volumeFromType(sound->getPlayType())); - sound->update(); + sound->applyUpdates(); } if(mMusic) { mMusic->setBaseVolume(volumeFromType(mMusic->getPlayType())); - mMusic->update(); + mMusic->applyUpdates(); } mOutput->finishUpdate(); }