mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 16:49:54 +00:00
Code Issues Releases Wiki Activity

Actually unload sounds when running over

Browse source
This commit is contained in:
Chris Robinson 2015-11-23 07:50:46 -08:00
parent 22a6811425
commit 0f33f41d8d
4 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,8 +22,10 @@ namespace MWSound
Sound_Handle mHandle; Sound_Handle mHandle;
Sound_Loudness mLoudness; Sound_Loudness mLoudness;
size_t mReferences;
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) : mResourceName(resname), mVolume(volume), mMinDist(mindist), mMaxDist(maxdist), mHandle(0), mReferences(0)
{ } { }
}; };
} }

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

@ -15,6 +15,9 @@ namespace MWSound
class Sound; class Sound;
class Sound_Loudness; class Sound_Loudness;
// An opaque handle for the implementation's sound buffers.
typedef void *Sound_Handle;
class Sound_Output class Sound_Output
{ {
SoundManager &mManager; SoundManager &mManager;

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

@ -122,7 +122,7 @@ namespace MWSound
// Lookup a soundid for its sound data (resource name, local volume, // Lookup a soundid for its sound data (resource name, local volume,
// minRange and maxRange. The returned pointer is only valid temporarily. // minRange and maxRange. The returned pointer is only valid temporarily.
const Sound_Buffer *SoundManager::lookup(const std::string &soundId) Sound_Buffer *SoundManager::lookup(const std::string &soundId)
{ {
NameBufferMap::iterator sfxiter = mSoundBuffers.find(soundId); NameBufferMap::iterator sfxiter = mSoundBuffers.find(soundId);
if(sfxiter != mSoundBuffers.end() && sfxiter->second.mHandle) if(sfxiter != mSoundBuffers.end() && sfxiter->second.mHandle)
@ -165,8 +165,10 @@ namespace MWSound
mVFS->normalizeFilename(sfxiter->second.mResourceName); mVFS->normalizeFilename(sfxiter->second.mResourceName);
} }
sfxiter->second.mHandle = mOutput->loadSound(sfxiter->second.mResourceName); Sound_Buffer *sfx = &sfxiter->second;
mBufferCacheSize += mOutput->getSoundDataSize(sfxiter->second.mHandle); sfx->mHandle = mOutput->loadSound(sfx->mResourceName);
mBufferCacheSize += mOutput->getSoundDataSize(sfx->mHandle);
// NOTE: Max sound buffer cache size is 15MB. Make configurable? // NOTE: Max sound buffer cache size is 15MB. Make configurable?
while(mBufferCacheSize > 15*1024*1024) while(mBufferCacheSize > 15*1024*1024)
{ {
@ -176,12 +178,14 @@ namespace MWSound
break; break;
} }
SoundSet::iterator iter = mUnusedBuffers.begin(); SoundSet::iterator iter = mUnusedBuffers.begin();
mBufferCacheSize -= mOutput->getSoundDataSize(*iter); sfxiter = mSoundBuffers.find(*iter);
mBufferCacheSize -= mOutput->getSoundDataSize(sfxiter->second.mHandle);
mOutput->unloadSound(sfxiter->second.mHandle);
mUnusedBuffers.erase(iter); mUnusedBuffers.erase(iter);
} }
mUnusedBuffers.insert(sfxiter->second.mHandle); mUnusedBuffers.insert(soundId);
return &sfxiter->second; return sfx;
} }
const Sound_Buffer *SoundManager::lookupVoice(const std::string &voicefile) const Sound_Buffer *SoundManager::lookupVoice(const std::string &voicefile)
@ -434,14 +438,14 @@ namespace MWSound
try try
{ {
std::string soundid = Misc::StringUtils::lowerCase(soundId); std::string soundid = Misc::StringUtils::lowerCase(soundId);
const Sound_Buffer *sfx = lookup(soundid); Sound_Buffer *sfx = lookup(soundid);
float basevol = volumeFromType(type); float basevol = volumeFromType(type);
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(mBufferRefs[sfx->mHandle]++ == 0) if(sfx->mReferences++ == 0)
mUnusedBuffers.erase(sfx->mHandle); mUnusedBuffers.erase(soundid);
mActiveSounds[MWWorld::Ptr()].push_back(std::make_pair(sound, soundid)); mActiveSounds[MWWorld::Ptr()].push_back(std::make_pair(sound, soundid));
} }
catch(std::exception&) catch(std::exception&)
@ -461,7 +465,7 @@ namespace MWSound
{ {
// Look up the sound in the ESM data // Look up the sound in the ESM data
std::string soundid = Misc::StringUtils::lowerCase(soundId); std::string soundid = Misc::StringUtils::lowerCase(soundId);
const Sound_Buffer *sfx = lookup(soundid); Sound_Buffer *sfx = lookup(soundid);
float basevol = volumeFromType(type); float basevol = volumeFromType(type);
const ESM::Position &pos = ptr.getRefData().getPosition(); const ESM::Position &pos = ptr.getRefData().getPosition();
const osg::Vec3f objpos(pos.asVec3()); const osg::Vec3f objpos(pos.asVec3());
@ -472,8 +476,8 @@ 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(mBufferRefs[sfx->mHandle]++ == 0) if(sfx->mReferences++ == 0)
mUnusedBuffers.erase(sfx->mHandle); mUnusedBuffers.erase(soundid);
if((mode&Play_NoTrack)) if((mode&Play_NoTrack))
mActiveSounds[MWWorld::Ptr()].push_back(std::make_pair(sound, soundid)); mActiveSounds[MWWorld::Ptr()].push_back(std::make_pair(sound, soundid));
else else
@ -496,14 +500,14 @@ namespace MWSound
{ {
// Look up the sound in the ESM data // Look up the sound in the ESM data
std::string soundid = Misc::StringUtils::lowerCase(soundId); std::string soundid = Misc::StringUtils::lowerCase(soundId);
const Sound_Buffer *sfx = lookup(soundid); Sound_Buffer *sfx = lookup(soundid);
float basevol = volumeFromType(type); float basevol = volumeFromType(type);
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(mBufferRefs[sfx->mHandle]++ == 0) if(sfx->mReferences++ == 0)
mUnusedBuffers.erase(sfx->mHandle); mUnusedBuffers.erase(soundid);
mActiveSounds[MWWorld::Ptr()].push_back(std::make_pair(sound, soundid)); mActiveSounds[MWWorld::Ptr()].push_back(std::make_pair(sound, soundid));
} }
catch(std::exception &) catch(std::exception &)
@ -752,8 +756,8 @@ namespace MWSound
if(!updateSound(sndname->first, snditer->first, duration)) if(!updateSound(sndname->first, snditer->first, duration))
{ {
NameBufferMap::iterator sfxiter = mSoundBuffers.find(sndname->second); NameBufferMap::iterator sfxiter = mSoundBuffers.find(sndname->second);
if(mBufferRefs[sfxiter->second.mHandle]-- == 1) if(sfxiter->second.mReferences-- == 1)
mUnusedBuffers.insert(sfxiter->second.mHandle); mUnusedBuffers.insert(sndname->second);
sndname = snditer->second.erase(sndname); sndname = snditer->second.erase(sndname);
} }
else else
@ -960,8 +964,8 @@ namespace MWSound
{ {
sndname->first->stop(); sndname->first->stop();
NameBufferMap::iterator sfxiter = mSoundBuffers.find(sndname->second); NameBufferMap::iterator sfxiter = mSoundBuffers.find(sndname->second);
if(mBufferRefs[sfxiter->second.mHandle]-- <= 1) if(sfxiter->second.mReferences-- == 1)
mUnusedBuffers.insert(sfxiter->second.mHandle); mUnusedBuffers.insert(sndname->second);
} }
} }
mActiveSounds.clear(); mActiveSounds.clear();

9
apps/openmw/mwsound/soundmanagerimp.hpp
View file

@ -23,9 +23,6 @@ namespace MWSound
class Sound; class Sound;
class Sound_Buffer; class Sound_Buffer;
// An opaque handle for the implementation's sound buffers.
typedef void *Sound_Handle;
enum Environment { enum Environment {
Env_Normal, Env_Normal,
Env_Underwater Env_Underwater
@ -54,9 +51,7 @@ namespace MWSound
// separately from buffer loading. // separately from buffer loading.
NameBufferMap mVoiceSoundBuffers; NameBufferMap mVoiceSoundBuffers;
typedef std::map<Sound_Handle,size_t> SoundRefMap; typedef std::set<std::string> SoundSet;
SoundRefMap mBufferRefs;
typedef std::set<Sound_Handle> SoundSet;
SoundSet mUnusedBuffers; SoundSet mUnusedBuffers;
boost::shared_ptr<Sound> mMusic; boost::shared_ptr<Sound> mMusic;
@ -79,7 +74,7 @@ namespace MWSound
int mPausedSoundTypes; int mPausedSoundTypes;
const Sound_Buffer *lookup(const std::string &soundId); Sound_Buffer *lookup(const std::string &soundId);
const Sound_Buffer *lookupVoice(const std::string &voicefile); const Sound_Buffer *lookupVoice(const std::string &voicefile);
void streamMusicFull(const std::string& filename); void streamMusicFull(const std::string& filename);