mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Hold a separate list for voice sound buffers

Browse Source 
This fixes say. Ideally voices would be streamed, but the loudness/"lip" buffer
extraction should be separated from the buffer loading code.
openmw-38
Chris Robinson 9 years ago
parent 4571218827
commit f4c22ec49e
3 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File

4
apps/openmw/mwsound/openal_output.cpp
Unescape Escape View File

@ -816,7 +816,7 @@ void OpenAL_Output::unloadSound(Sound_Handle data)
MWBase::SoundPtr OpenAL_Output::playSound(Sound_Handle data, float vol, float basevol, float pitch, int flags,float offset)
{
boost::shared_ptr<OpenAL_Sound> sound;
ALuint src=0;
ALuint src;
if(mFreeSources.empty())
fail("No free sources");
@ -851,7 +851,7 @@ MWBase::SoundPtr OpenAL_Output::playSound3D(Sound_Handle data, const osg::Vec3f
float min, float max, int flags, float offset)
{
boost::shared_ptr<OpenAL_Sound> sound;
ALuint src=0;
ALuint src;
if(mFreeSources.empty())
fail("No free sources");

70
apps/openmw/mwsound/soundmanagerimp.cpp
Unescape Escape View File

@ -101,6 +101,13 @@ namespace MWSound
mOutput->unloadSound(sfxiter->second.mHandle);
sfxiter->second.mHandle = 0;
}
sfxiter = mVoiceSoundBuffers.begin();
for(;sfxiter != mVoiceSoundBuffers.end();++sfxiter)
{
if(sfxiter->second.mHandle)
mOutput->unloadSound(sfxiter->second.mHandle);
sfxiter->second.mHandle = 0;
}
}
mUnderwaterSound.reset();
mActiveSounds.clear();
@ -162,6 +169,35 @@ namespace MWSound
return &sfxiter->second;
}
const Sound_Buffer *SoundManager::lookupVoice(const std::string &voicefile)
{
NameBufferMap::iterator sfxiter = mVoiceSoundBuffers.find(voicefile);
if(sfxiter == mVoiceSoundBuffers.end())
{
MWBase::World* world = MWBase::Environment::get().getWorld();
static const float fAudioMinDistanceMult = world->getStore().get<ESM::GameSetting>().find("fAudioMinDistanceMult")->getFloat();
static const float fAudioMaxDistanceMult = world->getStore().get<ESM::GameSetting>().find("fAudioMaxDistanceMult")->getFloat();
static const float fAudioVoiceDefaultMinDistance = world->getStore().get<ESM::GameSetting>().find("fAudioVoiceDefaultMinDistance")->getFloat();
static const float fAudioVoiceDefaultMaxDistance = world->getStore().get<ESM::GameSetting>().find("fAudioVoiceDefaultMaxDistance")->getFloat();
float minDistance = fAudioVoiceDefaultMinDistance * fAudioMinDistanceMult;
float maxDistance = fAudioVoiceDefaultMaxDistance * fAudioMaxDistanceMult;
minDistance = std::max(minDistance, 1.f);
maxDistance = std::max(minDistance, maxDistance);
sfxiter = mVoiceSoundBuffers.insert(std::make_pair(
voicefile, Sound_Buffer("sound/"+voicefile, 1.0f, minDistance, maxDistance)
)).first;
mVFS->normalizeFilename(sfxiter->second.mResourceName);
sfxiter->second.mHandle = mOutput->loadSound(sfxiter->second.mResourceName);
}
else if(!sfxiter->second.mHandle)
sfxiter->second.mHandle = mOutput->loadSound(sfxiter->second.mResourceName);
return &sfxiter->second;
}
// Gets the combined volume settings for the given sound type
float SoundManager::volumeFromType(PlayType type) const
{
@ -286,35 +322,21 @@ namespace MWSound
startRandomTitle();
}
void SoundManager::say(const MWWorld::Ptr &ptr, const std::string& filename)
void SoundManager::say(const MWWorld::Ptr &ptr, const std::string &filename)
{
if(!mOutput->isInitialized())
return;
try
{
#if 0
const Sound_Buffer *sfx = lookupVoice(Misc::StringUtils::lowerCase(filename));
float basevol = volumeFromType(Play_TypeVoice);
std::string filePath = "sound/"+filename;
const ESM::Position &pos = ptr.getRefData().getPosition();
const osg::Vec3f objpos(pos.asVec3());
MWBase::World* world = MWBase::Environment::get().getWorld();
static const float fAudioMinDistanceMult = world->getStore().get<ESM::GameSetting>().find("fAudioMinDistanceMult")->getFloat();
static const float fAudioMaxDistanceMult = world->getStore().get<ESM::GameSetting>().find("fAudioMaxDistanceMult")->getFloat();
static const float fAudioVoiceDefaultMinDistance = world->getStore().get<ESM::GameSetting>().find("fAudioVoiceDefaultMinDistance")->getFloat();
static const float fAudioVoiceDefaultMaxDistance = world->getStore().get<ESM::GameSetting>().find("fAudioVoiceDefaultMaxDistance")->getFloat();
float minDistance = fAudioVoiceDefaultMinDistance * fAudioMinDistanceMult;
float maxDistance = fAudioVoiceDefaultMaxDistance * fAudioMaxDistanceMult;
minDistance = std::max(minDistance, 1.f);
maxDistance = std::max(minDistance, maxDistance);
MWBase::SoundPtr sound = mOutput->playSound3D(filePath, objpos, 1.0f, basevol, 1.0f,
minDistance, maxDistance, Play_Normal|Play_TypeVoice, 0, true);
MWBase::SoundPtr sound = mOutput->playSound3D(sfx->mHandle,
objpos, sfx->mVolume, basevol, 1.0f, sfx->mMinDist, sfx->mMaxDist, Play_Normal|Play_TypeVoice, 0
);
mActiveSounds[sound] = std::make_pair(ptr, std::string("_say_sound"));
#else
throw std::runtime_error("say disabled");
#endif
}
catch(std::exception &e)
{
@ -343,15 +365,13 @@ namespace MWSound
return;
try
{
#if 0
const Sound_Buffer *sfx = lookupVoice(Misc::StringUtils::lowerCase(filename));
float basevol = volumeFromType(Play_TypeVoice);
std::string filePath = "Sound/"+filename;
MWBase::SoundPtr sound = mOutput->playSound(filePath, 1.0f, basevol, 1.0f, Play_Normal|Play_TypeVoice, 0);
MWBase::SoundPtr sound = mOutput->playSound(sfx->mHandle,
sfx->mVolume, basevol, 1.0f, Play_Normal|Play_TypeVoice, 0
);
mActiveSounds[sound] = std::make_pair(MWWorld::Ptr(), std::string("_say_sound"));
#else
throw std::runtime_error("say disabled");
#endif
}
catch(std::exception &e)
{

4
apps/openmw/mwsound/soundmanagerimp.hpp
Unescape Escape View File

@ -46,6 +46,9 @@ namespace MWSound
typedef std::map<std::string,Sound_Buffer> NameBufferMap;
NameBufferMap mSoundBuffers;
// Should stream voices, but that requires handling the "lip" data
// separately from buffer loading.
NameBufferMap mVoiceSoundBuffers;
boost::shared_ptr<Sound> mMusic;
std::string mCurrentPlaylist;
@ -64,6 +67,7 @@ namespace MWSound
int mPausedSoundTypes;
const Sound_Buffer *lookup(const std::string &soundId);
const Sound_Buffer *lookupVoice(const std::string &voicefile);
void streamMusicFull(const std::string& filename);
bool isPlaying(const MWWorld::Ptr &ptr, const std::string &id) const;

Write Preview
Loading…
Cancel
Save