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

Stop the object's old say sound before playing the new one

Browse source
This commit is contained in:
Chris Robinson 2015-12-11 15:49:45 -08:00
parent 7fc2df153a
commit f47f0a996f
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -410,8 +410,10 @@ namespace MWSound
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans(); const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
MWBase::SoundStreamPtr sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer())); SoundLoudnessPair &old = mActiveSaySounds[ptr];
mActiveSaySounds[ptr] = std::make_pair(sound, loudness); if(old.first.get()) mOutput->finishStream(old.first);
old = std::make_pair(playVoice(decoder, pos, (ptr == MWMechanics::getPlayer())),
loudness);
} }
} }
catch(std::exception &e) catch(std::exception &e)
@ -450,8 +452,9 @@ namespace MWSound
mPendingSaySounds[MWWorld::Ptr()] = std::make_pair(decoder, loudness); mPendingSaySounds[MWWorld::Ptr()] = std::make_pair(decoder, loudness);
else else
{ {
MWBase::SoundStreamPtr sound = playVoice(decoder, osg::Vec3f(), true); SoundLoudnessPair &old = mActiveSaySounds[MWWorld::Ptr()];
mActiveSaySounds[MWWorld::Ptr()] = std::make_pair(sound, loudness); if(old.first.get()) mOutput->finishStream(old.first);
old = std::make_pair(playVoice(decoder, osg::Vec3f(), true), loudness);
} }
} }
catch(std::exception &e) catch(std::exception &e)
@ -904,16 +907,18 @@ namespace MWSound
MWBase::SoundStreamPtr sound; MWBase::SoundStreamPtr sound;
MWWorld::Ptr ptr = penditer->first; MWWorld::Ptr ptr = penditer->first;
SoundLoudnessPair &old = mActiveSaySounds[ptr];
if(old.first.get()) mOutput->finishStream(old.first);
if(ptr == MWWorld::Ptr()) if(ptr == MWWorld::Ptr())
sound = playVoice(decoder, osg::Vec3f(), true); sound = playVoice(decoder, osg::Vec3f(), true);
else else
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans(); const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer())); sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
} }
mActiveSaySounds[ptr] = std::make_pair(sound, loudness); old = std::make_pair(sound, loudness);
} }
catch(std::exception &e) { catch(std::exception &e) {
std::cerr<< "Sound Error: "<<e.what() <<std::endl; std::cerr<< "Sound Error: "<<e.what() <<std::endl;