diff --git a/apps/openmw/mwsound/soundmanager.cpp b/apps/openmw/mwsound/soundmanager.cpp index 1b21660fcb..f800a39e37 100644 --- a/apps/openmw/mwsound/soundmanager.cpp +++ b/apps/openmw/mwsound/soundmanager.cpp @@ -20,16 +20,22 @@ using namespace std; #ifdef OPENMW_USE_AUDIERE #include #define SOUND_FACTORY OpenAL_Audiere_Factory +#define SOUND_OUT "OpenAL" +#define SOUND_IN "Audiere" #endif #ifdef OPENMW_USE_FFMPEG #include #define SOUND_FACTORY OpenAL_FFMpeg_Factory +#define SOUND_OUT "OpenAL" +#define SOUND_IN "FFmpeg" #endif #ifdef OPENMW_USE_MPG123 #include #define SOUND_FACTORY OpenAL_SndFile_Mpg123_Factory +#define SOUND_OUT "OpenAL" +#define SOUND_IN "mpg123,sndfile" #endif using namespace Mangle::Sound; @@ -77,6 +83,9 @@ namespace MWSound , cameraTracker(mgr) , store(str) { + cout << "Sound output: " << SOUND_OUT << endl; + cout << "Sound decoder: " << SOUND_IN << endl; + // Attach the camera to the camera tracker cameraTracker.followCamera(camera); @@ -181,12 +190,6 @@ namespace MWSound { 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: // Store the reference, the jukebox will need to check status, // control volume etc.