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

Revert "Started implementing sound time tracking so we can have NPCs' mouths move as they talk."

Browse source 
This reverts commit b897080156.
This commit is contained in:
Kevin Poitra 2014-05-28 15:04:35 -05:00
parent 18314b1707
commit 8516b837ff
3 changed files with 3 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwbase/soundmanager.hpp
View file

@ -100,9 +100,6 @@ namespace MWBase
virtual void stopSay(const MWWorld::Ptr &reference=MWWorld::Ptr()) = 0;
///< Stop an actor speaking
virtual float getSoundPlayingTime(const MWWorld::Ptr &reference=MWWorld::Ptr()) = 0;
///< Get the amount of time this sound has been playing.
virtual SoundPtr playTrack(const MWSound::DecoderPtr& decoder, PlayType type) = 0;
///< Play a 2D audio track, using a custom decoder

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

@ -244,7 +244,6 @@ namespace MWSound
MWBase::SoundPtr sound = mOutput->playSound3D(filePath, objpos, 1.0f, basevol, 1.0f,
20.0f, 1500.0f, Play_Normal|Play_TypeVoice, 0);
mActiveSounds[sound] = std::make_pair(ptr, std::string("_say_sound"));
mSoundPlayTime[sound] = std::make_pair(ptr, 0);
}
catch(std::exception &e)
{
@ -262,9 +261,7 @@ namespace MWSound
std::string filePath = "Sound/"+filename;
MWBase::SoundPtr sound = mOutput->playSound(filePath, 1.0f, basevol, 1.0f, Play_Normal|Play_TypeVoice, 0);
MWWorld::Ptr ptr = MWWorld::Ptr();
mActiveSounds[sound] = std::make_pair(ptr, std::string("_say_sound"));
mSoundPlayTime[sound] = std::make_pair(ptr, 0);
mActiveSounds[sound] = std::make_pair(MWWorld::Ptr(), std::string("_say_sound"));
}
catch(std::exception &e)
{
@ -291,18 +288,6 @@ namespace MWSound
++snditer;
}
}
float SoundManager::getSoundPlayingTime(const MWWorld::Ptr &ptr)
{
typedef SoundPlayingTimeMap::iterator iter_type;
for(iter_type iterator = mSoundPlayTime.begin(); iterator != mSoundPlayTime.end(); iterator++)
{
if (iterator->second.first == ptr)
return iterator->second.second;
}
return 0;
}
MWBase::SoundPtr SoundManager::playTrack(const DecoderPtr& decoder, PlayType type)
@ -617,12 +602,8 @@ namespace MWSound
while(snditer != mActiveSounds.end())
{
if(!snditer->first->isPlaying())
{
mActiveSounds.erase(snditer);
mSoundPlayTime.erase(snditer->first);
snditer++;
}
else
mActiveSounds.erase(snditer++);
else
{
const MWWorld::Ptr &ptr = snditer->second.first;
if(!ptr.isEmpty())
@ -645,15 +626,6 @@ namespace MWSound
++snditer;
}
}
// Update the total playing time for all sounds.
// This is primarily used for detecting amplitude for NPC mouth animation.
typedef SoundPlayingTimeMap::iterator it_type;
for(it_type iterator = mSoundPlayTime.begin(); iterator != mSoundPlayTime.end(); iterator++)
{
iterator->second.second += duration;
}
}
void SoundManager::update(float duration)

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

@ -43,10 +43,6 @@ namespace MWSound
typedef std::pair<MWWorld::Ptr,std::string> PtrIDPair;
typedef std::map<MWBase::SoundPtr,PtrIDPair> SoundMap;
SoundMap mActiveSounds;
typedef std::pair<MWWorld::Ptr, float> PtrFloatPair;
typedef std::map<MWBase::SoundPtr, PtrFloatPair> SoundPlayingTimeMap;
SoundPlayingTimeMap mSoundPlayTime;
MWBase::SoundPtr mUnderwaterSound;
@ -108,9 +104,6 @@ namespace MWSound
virtual void stopSay(const MWWorld::Ptr &reference=MWWorld::Ptr());
///< Stop an actor speaking
virtual float getSoundPlayingTime(const MWWorld::Ptr &reference=MWWorld::Ptr());
///< Get the amount of time this sound has been playing.
virtual MWBase::SoundPtr playTrack(const DecoderPtr& decoder, PlayType type);
///< Play a 2D audio track, using a custom decoder