diff options
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/debugger.cpp | 3 | ||||
| -rw-r--r-- | engines/sherlock/music.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/music.h | 5 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/3do/movie_decoder.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/drivers/adlib.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_debugger.cpp | 3 | ||||
| -rw-r--r-- | engines/sherlock/sound.h | 3 |
7 files changed, 4 insertions, 16 deletions
diff --git a/engines/sherlock/debugger.cpp b/engines/sherlock/debugger.cpp index 39f8da3806..55243c4bc7 100644 --- a/engines/sherlock/debugger.cpp +++ b/engines/sherlock/debugger.cpp @@ -26,9 +26,6 @@ #include "sherlock/scalpel/scalpel.h" #include "sherlock/scalpel/scalpel_debugger.h" #include "sherlock/tattoo/tattoo_debugger.h" -#include "audio/mixer.h" -#include "audio/decoders/aiff.h" -#include "audio/decoders/wave.h" #include "common/str-array.h" namespace Sherlock { diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp index 5ea3318bd7..c52c30191a 100644 --- a/engines/sherlock/music.cpp +++ b/engines/sherlock/music.cpp @@ -26,6 +26,7 @@ #include "sherlock/sherlock.h" #include "sherlock/music.h" #include "sherlock/scalpel/drivers/mididriver.h" +#include "audio/audiostream.h" // for Miles Audio (Sherlock Holmes 2) #include "audio/miles.h" // for 3DO digital music diff --git a/engines/sherlock/music.h b/engines/sherlock/music.h index 186e2aa2dc..b1eba1d889 100644 --- a/engines/sherlock/music.h +++ b/engines/sherlock/music.h @@ -23,12 +23,9 @@ #ifndef SHERLOCK_MUSIC_H #define SHERLOCK_MUSIC_H -#include "audio/midiplayer.h" #include "audio/midiparser.h" -//#include "audio/mididrv.h" -#include "sherlock/scalpel/drivers/mididriver.h" +#include "audio/mididrv.h" // for 3DO digital music -#include "audio/audiostream.h" #include "audio/mixer.h" #include "common/mutex.h" #include "common/str-array.h" diff --git a/engines/sherlock/scalpel/3do/movie_decoder.cpp b/engines/sherlock/scalpel/3do/movie_decoder.cpp index da4d08ca47..da0d16c145 100644 --- a/engines/sherlock/scalpel/3do/movie_decoder.cpp +++ b/engines/sherlock/scalpel/3do/movie_decoder.cpp @@ -25,7 +25,6 @@ #include "common/textconsole.h" #include "audio/audiostream.h" -#include "audio/decoders/raw.h" #include "audio/decoders/3do.h" #include "sherlock/scalpel/3do/movie_decoder.h" diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp index 29a39f0c39..3d29d0c5ed 100644 --- a/engines/sherlock/scalpel/drivers/adlib.cpp +++ b/engines/sherlock/scalpel/drivers/adlib.cpp @@ -21,14 +21,12 @@ */ #include "sherlock/sherlock.h" -#include "sherlock/scalpel/drivers/mididriver.h" -#include "common/file.h" #include "common/system.h" #include "common/textconsole.h" #include "audio/fmopl.h" -#include "audio/softsynth/emumidi.h" +#include "audio/mididrv.h" namespace Sherlock { diff --git a/engines/sherlock/scalpel/scalpel_debugger.cpp b/engines/sherlock/scalpel/scalpel_debugger.cpp index 1495c76b43..02b39ade9b 100644 --- a/engines/sherlock/scalpel/scalpel_debugger.cpp +++ b/engines/sherlock/scalpel/scalpel_debugger.cpp @@ -22,10 +22,9 @@ #include "sherlock/scalpel/scalpel_debugger.h" #include "sherlock/sherlock.h" +#include "audio/audiostream.h" #include "audio/mixer.h" -#include "audio/decoders/3do.h" #include "audio/decoders/aiff.h" -#include "audio/decoders/wave.h" namespace Sherlock { diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h index 0a0ff83d1f..a82aaf6730 100644 --- a/engines/sherlock/sound.h +++ b/engines/sherlock/sound.h @@ -25,11 +25,8 @@ #include "common/scummsys.h" #include "common/str.h" -#include "audio/audiostream.h" #include "audio/mixer.h" #include "access/files.h" -#include "audio/midiplayer.h" -#include "audio/midiparser.h" namespace Sherlock { |