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

Rename mReferences to mUses

Browse source
This commit is contained in:
Chris Robinson 2015-11-25 03:34:44 -08:00
parent 0d4fea896c
commit 04f885d8cc
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,10 +21,10 @@ namespace MWSound
Sound_Handle mHandle; Sound_Handle mHandle;
size_t mReferences; size_t mUses;
Sound_Buffer(std::string resname, float volume, float mindist, float maxdist) Sound_Buffer(std::string resname, float volume, float mindist, float maxdist)
: mResourceName(resname), mVolume(volume), mMinDist(mindist), mMaxDist(maxdist), mHandle(0), mReferences(0) : mResourceName(resname), mVolume(volume), mMinDist(mindist), mMaxDist(maxdist), mHandle(0), mUses(0)
{ } { }
}; };
} }

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

@ -518,7 +518,7 @@ namespace MWSound
sound = mOutput->playSound(sfx->mHandle, sound = mOutput->playSound(sfx->mHandle,
volume * sfx->mVolume, basevol, pitch, mode|type, offset volume * sfx->mVolume, basevol, pitch, mode|type, offset
); );
if(sfx->mReferences++ == 0) if(sfx->mUses++ == 0)
{ {
SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfxid); SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfxid);
if(iter != mUnusedBuffers.end()) if(iter != mUnusedBuffers.end())
@ -554,7 +554,7 @@ namespace MWSound
sound = mOutput->playSound3D(sfx->mHandle, sound = mOutput->playSound3D(sfx->mHandle,
objpos, volume * sfx->mVolume, basevol, pitch, sfx->mMinDist, sfx->mMaxDist, mode|type, offset objpos, volume * sfx->mVolume, basevol, pitch, sfx->mMinDist, sfx->mMaxDist, mode|type, offset
); );
if(sfx->mReferences++ == 0) if(sfx->mUses++ == 0)
{ {
SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfxid); SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfxid);
if(iter != mUnusedBuffers.end()) if(iter != mUnusedBuffers.end())
@ -585,7 +585,7 @@ namespace MWSound
sound = mOutput->playSound3D(sfx->mHandle, sound = mOutput->playSound3D(sfx->mHandle,
initialPos, volume * sfx->mVolume, basevol, pitch, sfx->mMinDist, sfx->mMaxDist, mode|type, offset initialPos, volume * sfx->mVolume, basevol, pitch, sfx->mMinDist, sfx->mMaxDist, mode|type, offset
); );
if(sfx->mReferences++ == 0) if(sfx->mUses++ == 0)
{ {
SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfxid); SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfxid);
if(iter != mUnusedBuffers.end()) if(iter != mUnusedBuffers.end())
@ -831,7 +831,7 @@ namespace MWSound
if(!updateSound(sndidx->first, snditer->first, duration)) if(!updateSound(sndidx->first, snditer->first, duration))
{ {
Sound_Buffer *sfx = &mSoundBuffers[sndidx->second]; Sound_Buffer *sfx = &mSoundBuffers[sndidx->second];
if(sfx->mReferences-- == 1) if(sfx->mUses-- == 1)
mUnusedBuffers.push_front(sndidx->second); mUnusedBuffers.push_front(sndidx->second);
sndidx = snditer->second.erase(sndidx); sndidx = snditer->second.erase(sndidx);
} }
@ -1044,7 +1044,7 @@ namespace MWSound
{ {
sndidx->first->stop(); sndidx->first->stop();
Sound_Buffer *sfx = &mSoundBuffers[sndidx->second]; Sound_Buffer *sfx = &mSoundBuffers[sndidx->second];
if(sfx->mReferences-- == 1) if(sfx->mUses-- == 1)
mUnusedBuffers.push_front(sndidx->second); mUnusedBuffers.push_front(sndidx->second);
} }
} }