mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Remove a mostly unneeded wrapper function

Browse Source
This commit is contained in:
Chris Robinson 2012-03-21 19:08:11 -07:00
parent aecc77a73c
commit e6fe1c0261
2 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
apps/openmw/mwsound/soundmanager.cpp
View File

@ -110,27 +110,6 @@ namespace MWSound
return std::string("Sound/")+snd->sound;
}
// Add a sound to the list and play it
void SoundManager::play3d(const std::string &file,
MWWorld::Ptr ptr,
const std::string &id,
float volume, float pitch,
float min, float max,
bool loop, bool untracked)
{
try
{
const ESM::Position &pos = ptr.getCellRef().pos;
SoundPtr sound(mOutput->playSound3D(file, pos.pos, volume, pitch, min, max, loop));
if(untracked) mLooseSounds[id] = sound;
else mActiveSounds[ptr][id] = sound;
}
catch(std::exception &e)
{
std::cout <<"Sound Error: "<<e.what()<< std::endl;
}
}
bool SoundManager::isPlaying(MWWorld::Ptr ptr, const std::string &id) const
{
@ -198,9 +177,19 @@ namespace MWSound
void SoundManager::say(MWWorld::Ptr ptr, const std::string& filename)
{
// The range values are not tested
std::string filePath = std::string("Sound\\")+filename;
play3d(filePath, ptr, "_say_sound", 1, 1, 100, 20000, false);
try
{
// The range values are not tested
const ESM::Position &pos = ptr.getCellRef().pos;
std::string filePath = std::string("Sound/")+filename;
SoundPtr sound(mOutput->playSound3D(filePath, pos.pos, 1.0f, 1.0f, 100.0f, 20000.0f, false));
mActiveSounds[ptr]["_say_sound"] = sound;
}
catch(std::exception &e)
{
std::cout <<"Sound Error: "<<e.what()<< std::endl;
}
}
bool SoundManager::sayDone(MWWorld::Ptr ptr) const
@ -220,7 +209,7 @@ namespace MWSound
}
catch(std::exception &e)
{
std::cout <<"Sound play error: "<<e.what()<< std::endl;
std::cout <<"Sound Error: "<<e.what()<< std::endl;
}
}
@ -231,12 +220,16 @@ namespace MWSound
try
{
// Look up the sound in the ESM data
const ESM::Position &pos = ptr.getCellRef().pos;
std::string file = lookup(soundId, volume, min, max);
play3d(file, ptr, soundId, volume, pitch, min, max, loop, untracked);
SoundPtr sound(mOutput->playSound3D(file, pos.pos, volume, pitch, min, max, loop));
if(untracked) mLooseSounds[soundId] = sound;
else mActiveSounds[ptr][soundId] = sound;
}
catch(std::exception &e)
{
std::cout <<"Sound play error: "<<e.what()<< std::endl;
std::cout <<"Sound Error: "<<e.what()<< std::endl;
}
}

4
apps/openmw/mwsound/soundmanager.hpp
View File

@ -54,10 +54,6 @@ namespace MWSound
std::string lookup(const std::string &soundId,
float &volume, float &min, float &max);
void play3d(const std::string &file,
MWWorld::Ptr ptr, const std::string &id,
float volume, float pitch, float min, float max,
bool loop, bool untracked=false);
void streamMusicFull(const std::string& filename);
bool isPlaying(MWWorld::Ptr ptr, const std::string &id) const;
void updateRegionSound(float duration);