diff options
author | Max Horn | 2010-02-17 23:38:43 +0000 |
---|---|---|
committer | Max Horn | 2010-02-17 23:38:43 +0000 |
commit | ee1110a114d8e6f889474374943ff0bce701a9ff (patch) | |
tree | 2d28887cb8ea0b75be3bb9b7d45e95984d7fdc97 /engines/sci/sound | |
parent | 86e34c34643ddd3920025c3423ece4e1c3aaeda1 (diff) | |
download | scummvm-rg350-ee1110a114d8e6f889474374943ff0bce701a9ff.tar.gz scummvm-rg350-ee1110a114d8e6f889474374943ff0bce701a9ff.tar.bz2 scummvm-rg350-ee1110a114d8e6f889474374943ff0bce701a9ff.zip |
SCI: Reduce header interdependencies
svn-id: r48086
Diffstat (limited to 'engines/sci/sound')
-rw-r--r-- | engines/sci/sound/audio.cpp | 1 | ||||
-rw-r--r-- | engines/sci/sound/drivers/adlib.cpp | 2 | ||||
-rw-r--r-- | engines/sci/sound/drivers/fb01.cpp | 3 | ||||
-rw-r--r-- | engines/sci/sound/drivers/midi.cpp | 2 | ||||
-rw-r--r-- | engines/sci/sound/drivers/mididriver.h | 1 | ||||
-rw-r--r-- | engines/sci/sound/drivers/pcjr.cpp | 2 | ||||
-rw-r--r-- | engines/sci/sound/music.h | 7 |
7 files changed, 14 insertions, 4 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index 4643448dc4..9502b279ae 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -30,6 +30,7 @@ #include "sci/sound/audio.h" #include "common/system.h" +#include "common/file.h" #include "sound/audiostream.h" #include "sound/audiocd.h" diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp index fa5e2c5697..a8733dc0a2 100644 --- a/engines/sci/sound/drivers/adlib.cpp +++ b/engines/sci/sound/drivers/adlib.cpp @@ -25,6 +25,8 @@ #include "sci/sci.h" +#include "common/file.h" + #include "sound/fmopl.h" #include "sound/softsynth/emumidi.h" diff --git a/engines/sci/sound/drivers/fb01.cpp b/engines/sci/sound/drivers/fb01.cpp index 2a9f9b1239..7e9fbd51a1 100644 --- a/engines/sci/sound/drivers/fb01.cpp +++ b/engines/sci/sound/drivers/fb01.cpp @@ -28,6 +28,9 @@ #include "sci/resource.h" #include "sci/sound/drivers/mididriver.h" +#include "common/file.h" +#include "common/system.h" + namespace Sci { static byte volumeTable[64] = { diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp index 4150ae7ce7..2432a8fab0 100644 --- a/engines/sci/sound/drivers/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -26,6 +26,8 @@ #include "sci/sci.h" #include "common/config-manager.h" +#include "common/file.h" + #include "sound/fmopl.h" #include "sound/softsynth/emumidi.h" diff --git a/engines/sci/sound/drivers/mididriver.h b/engines/sci/sound/drivers/mididriver.h index a3f9c7302a..12d3e57f5d 100644 --- a/engines/sci/sound/drivers/mididriver.h +++ b/engines/sci/sound/drivers/mididriver.h @@ -28,7 +28,6 @@ #include "sci/sci.h" #include "sound/mididrv.h" -#include "sound/softsynth/emumidi.h" #include "common/error.h" namespace Sci { diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp index e9204d0c72..420007b698 100644 --- a/engines/sci/sound/drivers/pcjr.cpp +++ b/engines/sci/sound/drivers/pcjr.cpp @@ -25,6 +25,8 @@ #include "sci/sound/drivers/mididriver.h" +#include "sound/softsynth/emumidi.h" + namespace Sci { #define VOLUME_SHIFT 3 diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h index 9f4bb1ce07..be935280b6 100644 --- a/engines/sci/sound/music.h +++ b/engines/sci/sound/music.h @@ -26,14 +26,15 @@ #ifndef SCI_MUSIC_H #define SCI_MUSIC_H -#include "common/savefile.h" +#ifndef USE_OLD_MUSIC_FUNCTIONS #include "common/serializer.h" +#endif #include "common/mutex.h" #include "sound/mixer.h" #include "sound/audiostream.h" -#include "sound/mididrv.h" -#include "sound/midiparser.h" +//#include "sound/mididrv.h" +//#include "sound/midiparser.h" #include "sci/sci.h" #include "sci/resource.h" |