diff options
| author | Willem Jan Palenstijn | 2016-07-21 13:30:47 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2016-07-21 13:30:47 +0200 |
| commit | 6f001d831623a46f643379554d20e94463d8c2f1 (patch) | |
| tree | 901caa296592814b48a98ac2e3d381331c5a7821 /engines/hopkins | |
| parent | 75fdd1504de98c7c6937344877685bfef6514344 (diff) | |
| parent | 5f301b24002fffb3e8e05061a92ae2e0ee3a92ec (diff) | |
| download | scummvm-rg350-6f001d831623a46f643379554d20e94463d8c2f1.tar.gz scummvm-rg350-6f001d831623a46f643379554d20e94463d8c2f1.tar.bz2 scummvm-rg350-6f001d831623a46f643379554d20e94463d8c2f1.zip | |
Merge branch 'master' into titanic
Diffstat (limited to 'engines/hopkins')
| -rw-r--r-- | engines/hopkins/hopkins.h | 1 | ||||
| -rw-r--r-- | engines/hopkins/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/hopkins/sound.h | 10 |
3 files changed, 10 insertions, 3 deletions
diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h index b782d103a8..30140baa2e 100644 --- a/engines/hopkins/hopkins.h +++ b/engines/hopkins/hopkins.h @@ -48,7 +48,6 @@ #include "common/util.h" #include "engines/engine.h" #include "graphics/surface.h" -#include "gui/debugger.h" /** * This is the namespace of the Hopkins engine. diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp index 6660233740..3030636a59 100644 --- a/engines/hopkins/sound.cpp +++ b/engines/hopkins/sound.cpp @@ -26,6 +26,8 @@ #include "hopkins/hopkins.h" #include "audio/decoders/adpcm_intern.h" +#include "audio/decoders/wave.h" +#include "audio/softsynth/pcspk.h" #include "common/system.h" #include "common/config-manager.h" #include "common/file.h" diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h index 1fb4f9ae71..49c5846198 100644 --- a/engines/hopkins/sound.h +++ b/engines/hopkins/sound.h @@ -25,10 +25,16 @@ #include "common/scummsys.h" #include "common/str.h" -#include "audio/audiostream.h" -#include "audio/decoders/wave.h" #include "audio/mixer.h" +namespace Audio { +class RewindableAudioStream; +} + +namespace Common { +class SeekableReadStream; +} + namespace Hopkins { class VoiceItem { |