teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Rename Sound::update to Sound::applyUpdates

Browse source
This commit is contained in:
Chris Robinson 2015-11-27 04:55:17 -08:00
parent 9568aa6a84
commit f3c035907c
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,7 +188,7 @@ public:
virtual void stop(); virtual void stop();
virtual bool isPlaying(); virtual bool isPlaying();
virtual double getTimeOffset(); virtual double getTimeOffset();
virtual void update(); virtual void applyUpdates();
void play(); void play();
bool process(); bool process();
@ -206,7 +206,7 @@ public:
: OpenAL_SoundStream(output, src, decoder, pos, vol, basevol, pitch, mindist, maxdist, flags) : 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); alSourcei(mSource, AL_LOOPING, AL_FALSE);
update(); applyUpdates();
} }
void OpenAL_SoundStream::update() void OpenAL_SoundStream::applyUpdates()
{ {
ALfloat gain = mVolume*mBaseVolume; ALfloat gain = mVolume*mBaseVolume;
ALfloat pitch = mPitch; ALfloat pitch = mPitch;
@ -490,7 +490,7 @@ ALint OpenAL_SoundStream::refillQueue()
return queued; return queued;
} }
void OpenAL_SoundStream3D::update() void OpenAL_SoundStream3D::applyUpdates()
{ {
ALfloat gain = mVolume*mBaseVolume; ALfloat gain = mVolume*mBaseVolume;
ALfloat pitch = mPitch; ALfloat pitch = mPitch;
@ -536,7 +536,7 @@ public:
virtual void stop(); virtual void stop();
virtual bool isPlaying(); virtual bool isPlaying();
virtual double getTimeOffset(); 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) : 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) 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); 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 gain = mVolume*mBaseVolume;
ALfloat pitch = mPitch; ALfloat pitch = mPitch;
@ -636,7 +636,7 @@ void OpenAL_Sound::update()
throwALerror(); throwALerror();
} }
void OpenAL_Sound3D::update() void OpenAL_Sound3D::applyUpdates()
{ {
ALfloat gain = mVolume*mBaseVolume; ALfloat gain = mVolume*mBaseVolume;
ALfloat pitch = mPitch; ALfloat pitch = mPitch;

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

@ -25,7 +25,7 @@ namespace MWSound
virtual void stop() = 0; virtual void stop() = 0;
virtual bool isPlaying() = 0; virtual bool isPlaying() = 0;
virtual double getTimeOffset() = 0; virtual double getTimeOffset() = 0;
virtual void update() = 0; virtual void applyUpdates() = 0;
void setPosition(const osg::Vec3f &pos) { mPos = pos; } void setPosition(const osg::Vec3f &pos) { mPos = pos; }
void setVolume(float volume) { mVolume = volume; } void setVolume(float volume) { mVolume = volume; }
void setBaseVolume(float volume) { mBaseVolume = volume; } void setBaseVolume(float volume) { mBaseVolume = volume; }

8
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -863,7 +863,7 @@ namespace MWSound
sound->updateFade(duration); sound->updateFade(duration);
sound->update(); sound->applyUpdates();
return true; return true;
} }
@ -901,7 +901,7 @@ namespace MWSound
{ {
MWBase::SoundPtr sound = sndidx->first; MWBase::SoundPtr sound = sndidx->first;
sound->setBaseVolume(volumeFromType(sound->getPlayType())); sound->setBaseVolume(volumeFromType(sound->getPlayType()));
sound->update(); sound->applyUpdates();
} }
} }
SaySoundMap::iterator sayiter = mActiveSaySounds.begin(); SaySoundMap::iterator sayiter = mActiveSaySounds.begin();
@ -909,12 +909,12 @@ namespace MWSound
{ {
MWBase::SoundPtr sound = sayiter->second.first; MWBase::SoundPtr sound = sayiter->second.first;
sound->setBaseVolume(volumeFromType(sound->getPlayType())); sound->setBaseVolume(volumeFromType(sound->getPlayType()));
sound->update(); sound->applyUpdates();
} }
if(mMusic) if(mMusic)
{ {
mMusic->setBaseVolume(volumeFromType(mMusic->getPlayType())); mMusic->setBaseVolume(volumeFromType(mMusic->getPlayType()));
mMusic->update(); mMusic->applyUpdates();
} }
mOutput->finishUpdate(); mOutput->finishUpdate();
} }