From 975dbef0e58289a81cd55cf43304e5e20114a876 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 15 Feb 2010 00:20:53 +0000
Subject: SCI: Remove sound/audio.h include from engine/state.h

svn-id: r48063
---
 engines/sci/engine/game.cpp    | 1 +
 engines/sci/engine/ksound.cpp  | 1 +
 engines/sci/engine/state.h     | 1 -
 engines/sci/sound/audio.h      | 1 +
 engines/sci/sound/soundcmd.cpp | 1 +
 5 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index db77724a57..b48ec13448 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -37,6 +37,7 @@
 #include "sci/engine/message.h"
 #include "sci/graphics/gui.h"
 #include "sci/graphics/menu.h"
+#include "sci/sound/audio.h"
 #include "sci/sound/music.h"
 
 namespace Sci {
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index caf9f6bcff..2d597fdc3f 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -28,6 +28,7 @@
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/vm.h"		// for Object
+#include "sci/sound/audio.h"
 #include "sci/sound/soundcmd.h"
 
 #include "sound/mixer.h"
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 7f5d3cb8c1..7284f83319 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -40,7 +40,6 @@ namespace Common {
 
 #include "sci/parser/vocabulary.h"
 
-#include "sci/sound/audio.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 #include "sci/sound/iterator/core.h"
 #endif
diff --git a/engines/sci/sound/audio.h b/engines/sci/sound/audio.h
index bab7dbb969..9fc3cbac51 100644
--- a/engines/sci/sound/audio.h
+++ b/engines/sci/sound/audio.h
@@ -27,6 +27,7 @@
 #ifndef SCI_AUDIO_H
 #define SCI_AUDIO_H
 
+#include "sci/engine/vm_types.h"
 #include "sound/mixer.h"
 
 namespace Sci {
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 214180fafd..20bce575f5 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -30,6 +30,7 @@
 #endif
 
 #include "common/config-manager.h"
+#include "sci/sound/audio.h"
 #include "sci/sound/music.h"
 #include "sci/sound/soundcmd.h"
 
-- 
cgit v1.2.3