Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-01 14:27:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

Merge branch 'sound_system'

Browse source
This commit is contained in:
Nicolay Korslund 2010-08-17 13:21:52 +02:00
commit 88f10eb222
3 changed files with 161 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

49
apps/openmw/mwsound/soundmanager.cpp
View file

@ -16,7 +16,7 @@ using namespace std;
/* Set up the sound manager to use Audiere, FFMPEG or /* Set up the sound manager to use Audiere, FFMPEG or
MPG123/libsndfile for input. The OPENMW_USE_x macros are set in MPG123/libsndfile for input. The OPENMW_USE_x macros are set in
CMakeLists.txt. CMakeLists.txt.
*/ */
#ifdef OPENMW_USE_AUDIERE #ifdef OPENMW_USE_AUDIERE
#include <mangle/sound/filters/openal_audiere.hpp> #include <mangle/sound/filters/openal_audiere.hpp>
#define SOUND_FACTORY OpenAL_Audiere_Factory #define SOUND_FACTORY OpenAL_Audiere_Factory
@ -36,15 +36,7 @@ using namespace Mangle::Sound;
typedef OEngine::Sound::SoundManager OEManager; typedef OEngine::Sound::SoundManager OEManager;
typedef OEngine::Sound::SoundManagerPtr OEManagerPtr; typedef OEngine::Sound::SoundManagerPtr OEManagerPtr;
/* Set the position on a sound based on a Ptr. TODO: We do not support // Set the position on a sound based on a Ptr.
tracking moving objects yet, once a sound is started it stays in
the same place until it finishes.
This obviously has to be fixed at some point for player/npc
footstep sounds and the like. However, updating all sounds each
frame is expensive, so there should be a special flag for sounds
that need to track their attached object.
*/
static void setPos(SoundPtr &snd, const MWWorld::Ptr ref) static void setPos(SoundPtr &snd, const MWWorld::Ptr ref)
{ {
// Get sound position from the reference // Get sound position from the reference
@ -114,7 +106,7 @@ namespace MWSound
// Add a sound to the list and play it // Add a sound to the list and play it
void add(const std::string &file, void add(const std::string &file,
MWWorld::Ptr reference, MWWorld::Ptr ptr,
const std::string &id, const std::string &id,
float volume, float pitch, float volume, float pitch,
float min, float max, float min, float max,
@ -127,7 +119,7 @@ namespace MWSound
snd->setVolume(volume); snd->setVolume(volume);
snd->setPitch(pitch); snd->setPitch(pitch);
snd->setRange(min,max); snd->setRange(min,max);
setPos(snd, reference); setPos(snd, ptr);
snd->play(); snd->play();
} }
catch(...) catch(...)
@ -138,23 +130,20 @@ namespace MWSound
// Stop a sound and remove it from the list. If id="" then // Stop a sound and remove it from the list. If id="" then
// remove the entire object and stop all its sounds. // remove the entire object and stop all its sounds.
void remove(MWWorld::Ptr reference, const std::string &id = "") void remove(MWWorld::Ptr ptr, const std::string &id = "")
{ {
} }
bool isPlaying(MWWorld::Ptr reference, const std::string &id) const bool isPlaying(MWWorld::Ptr ptr, const std::string &id) const
{ {
return true; return true;
} }
void removeCell(const MWWorld::Ptr::CellStore *cell) void removeCell(const MWWorld::Ptr::CellStore *cell)
{ {
// Note to Nico: You can get the cell of a Ptr via the getCell
// function. Just iterate over all sounds and remove those
// with matching cell.
} }
void updatePositions(MWWorld::Ptr reference) void updatePositions(MWWorld::Ptr ptr)
{ {
} }
}; };
@ -171,15 +160,15 @@ namespace MWSound
delete mData; delete mData;
} }
void SoundManager::say (MWWorld::Ptr reference, const std::string& filename) void SoundManager::say (MWWorld::Ptr ptr, const std::string& filename)
{ {
// The range values are not tested // The range values are not tested
mData->add(filename, reference, "_say_sound", 1, 1, 100, 10000, false); mData->add(filename, ptr, "_say_sound", 1, 1, 100, 10000, false);
} }
bool SoundManager::sayDone (MWWorld::Ptr reference) const bool SoundManager::sayDone (MWWorld::Ptr ptr) const
{ {
return !mData->isPlaying(reference, "_say_sound"); return !mData->isPlaying(ptr, "_say_sound");
} }
void SoundManager::streamMusic (const std::string& filename) void SoundManager::streamMusic (const std::string& filename)
@ -206,19 +195,19 @@ namespace MWSound
} }
} }
void SoundManager::playSound3D (MWWorld::Ptr reference, const std::string& soundId, void SoundManager::playSound3D (MWWorld::Ptr ptr, const std::string& soundId,
float volume, float pitch, bool loop) float volume, float pitch, bool loop)
{ {
// Look up the sound in the ESM data // Look up the sound in the ESM data
float min, max; float min, max;
const std::string &file = mData->lookup(soundId, volume, min, max); const std::string &file = mData->lookup(soundId, volume, min, max);
if(file != "") if(file != "")
mData->add(file, reference, soundId, volume, pitch, min, max, loop); mData->add(file, ptr, soundId, volume, pitch, min, max, loop);
} }
void SoundManager::stopSound3D (MWWorld::Ptr reference, const std::string& soundId) void SoundManager::stopSound3D (MWWorld::Ptr ptr, const std::string& soundId)
{ {
mData->remove(reference, soundId); mData->remove(ptr, soundId);
} }
void SoundManager::stopSound (MWWorld::Ptr::CellStore *cell) void SoundManager::stopSound (MWWorld::Ptr::CellStore *cell)
@ -226,13 +215,13 @@ namespace MWSound
mData->removeCell(cell); mData->removeCell(cell);
} }
bool SoundManager::getSoundPlaying (MWWorld::Ptr reference, const std::string& soundId) const bool SoundManager::getSoundPlaying (MWWorld::Ptr ptr, const std::string& soundId) const
{ {
return mData->isPlaying(reference, soundId); return mData->isPlaying(ptr, soundId);
} }
void SoundManager::updateObject(MWWorld::Ptr reference) void SoundManager::updateObject(MWWorld::Ptr ptr)
{ {
mData->updatePositions(reference); mData->updatePositions(ptr);
} }
} }

2
libs/mangle

@ -1 +1 @@
Subproject commit c982f701cacdd2932bfdc22b168f54221a549b62 Subproject commit cd4ed4e6bfb23d736c4b1f30d6096ec164ba937b

2
libs/openengine

@ -1 +1 @@
Subproject commit b9d4dc448bc3be908653f9dea3c3450fb85ed107 Subproject commit 2e2f8e9725fd1a27a82d0ad5c6c0e296e715eb60