mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Renabled music. WILL CRASH WITH MPG123 v1.12.1.

Browse source
This commit is contained in:
Nicolay Korslund 2010-08-18 14:50:49 +02:00
parent 65c2070086
commit 9a5e7816eb
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,16 +20,22 @@ using namespace std;
#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
#define SOUND_OUT "OpenAL"
#define SOUND_IN "Audiere"
#endif #endif
#ifdef OPENMW_USE_FFMPEG #ifdef OPENMW_USE_FFMPEG
#include <mangle/sound/filters/openal_ffmpeg.hpp> #include <mangle/sound/filters/openal_ffmpeg.hpp>
#define SOUND_FACTORY OpenAL_FFMpeg_Factory #define SOUND_FACTORY OpenAL_FFMpeg_Factory
#define SOUND_OUT "OpenAL"
#define SOUND_IN "FFmpeg"
#endif #endif
#ifdef OPENMW_USE_MPG123 #ifdef OPENMW_USE_MPG123
#include <mangle/sound/filters/openal_sndfile_mpg123.hpp> #include <mangle/sound/filters/openal_sndfile_mpg123.hpp>
#define SOUND_FACTORY OpenAL_SndFile_Mpg123_Factory #define SOUND_FACTORY OpenAL_SndFile_Mpg123_Factory
#define SOUND_OUT "OpenAL"
#define SOUND_IN "mpg123,sndfile"
#endif #endif
using namespace Mangle::Sound; using namespace Mangle::Sound;
@ -77,6 +83,9 @@ namespace MWSound
, cameraTracker(mgr) , cameraTracker(mgr)
, store(str) , store(str)
{ {
cout << "Sound output: " << SOUND_OUT << endl;
cout << "Sound decoder: " << SOUND_IN << endl;
// Attach the camera to the camera tracker // Attach the camera to the camera tracker
cameraTracker.followCamera(camera); cameraTracker.followCamera(camera);
@ -181,12 +190,6 @@ namespace MWSound
{ {
if(!mData) return; if(!mData) return;
#ifdef OPENMW_USE_MPG123
// Disable music
cout << " - music is temporarily disabled -\n";
return;
#endif
// Play the sound and tell it to stream, if possible. TODO: // Play the sound and tell it to stream, if possible. TODO:
// Store the reference, the jukebox will need to check status, // Store the reference, the jukebox will need to check status,
// control volume etc. // control volume etc.