aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorOri Avtalion2016-04-14 16:10:21 +0300
committerOri Avtalion2016-04-14 16:10:21 +0300
commit356403233047e260e34887ba0144892be322f472 (patch)
tree354b2e73ded557e3aa543460a1fe8e952b4a0c88 /engines/sci
parent253e18c44080f57eb2334296e09297a2db5efda9 (diff)
downloadscummvm-rg350-356403233047e260e34887ba0144892be322f472.tar.gz
scummvm-rg350-356403233047e260e34887ba0144892be322f472.tar.bz2
scummvm-rg350-356403233047e260e34887ba0144892be322f472.zip
JANITORIAL: Reduce audio header dependencies
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/sound/drivers/midi.cpp2
-rw-r--r--engines/sci/sound/music.h6
-rw-r--r--engines/sci/sound/soundcmd.cpp2
3 files changed, 8 insertions, 2 deletions
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index aa464cdc19..5e82e4a729 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -27,7 +27,7 @@
#include "common/memstream.h"
#include "common/system.h"
-#include "audio/fmopl.h"
+#include "audio/mididrv.h"
#include "sci/resource.h"
#include "sci/engine/features.h"
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index a610f32d89..047f63b3b7 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -27,12 +27,16 @@
#include "common/mutex.h"
#include "audio/mixer.h"
-#include "audio/audiostream.h"
#include "sci/sci.h"
#include "sci/resource.h"
#include "sci/sound/drivers/mididriver.h"
+namespace Audio {
+class LoopingAudioStream;
+class RewindableAudioStream;
+}
+
namespace Sci {
enum SoundStatus {
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index e7b25eb1fc..fe33ea1feb 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -21,6 +21,8 @@
*/
#include "common/config-manager.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
#include "sci/sound/audio.h"
#include "sci/sound/music.h"
#include "sci/sound/soundcmd.h"