From 65c2070086aaec0cd60f6fc48d39ec5aa035ee3b Mon Sep 17 00:00:00 2001 From: Nicolay Korslund Date: Wed, 18 Aug 2010 13:05:31 +0200 Subject: [PATCH] Temporarily disabled music --- apps/openmw/mwsound/soundmanager.cpp | 6 ++++++ libs/mangle | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwsound/soundmanager.cpp b/apps/openmw/mwsound/soundmanager.cpp index f9f3dc9cb..1b21660fc 100644 --- a/apps/openmw/mwsound/soundmanager.cpp +++ b/apps/openmw/mwsound/soundmanager.cpp @@ -181,6 +181,12 @@ 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. diff --git a/libs/mangle b/libs/mangle index 27bef8409..200fab03e 160000 --- a/libs/mangle +++ b/libs/mangle @@ -1 +1 @@ -Subproject commit 27bef840916581c0dd85b9c8b6ab4109e000dbac +Subproject commit 200fab03efaa2cbe1b8fce4a742b0195f8912295