aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush
diff options
context:
space:
mode:
authorMax Horn2005-01-09 03:15:59 +0000
committerMax Horn2005-01-09 03:15:59 +0000
commit32f0dbdcb291eef03d1bc031ba9d23b6a2fdebe6 (patch)
treeb30f994afe51adb688eb520e341a9b00104fe87e /scumm/smush
parentbc44b5ec15e7d7f933e455e46c2f603e2800cd82 (diff)
downloadscummvm-rg350-32f0dbdcb291eef03d1bc031ba9d23b6a2fdebe6.tar.gz
scummvm-rg350-32f0dbdcb291eef03d1bc031ba9d23b6a2fdebe6.tar.bz2
scummvm-rg350-32f0dbdcb291eef03d1bc031ba9d23b6a2fdebe6.zip
Moving AppendableAudioStream into SCUMM engine, as it is only used there
svn-id: r16494
Diffstat (limited to 'scumm/smush')
-rw-r--r--scumm/smush/smush_mixer.h3
-rw-r--r--scumm/smush/smush_player.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/scumm/smush/smush_mixer.h b/scumm/smush/smush_mixer.h
index 29d40766cc..051303997e 100644
--- a/scumm/smush/smush_mixer.h
+++ b/scumm/smush/smush_mixer.h
@@ -23,8 +23,7 @@
#define SMUSH_MIXER_H
#include "stdafx.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "scumm/sound.h"
namespace Scumm {
diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h
index 08629450b5..4238e0f053 100644
--- a/scumm/smush/smush_player.h
+++ b/scumm/smush/smush_player.h
@@ -26,8 +26,7 @@
#include "scumm/smush/chunk.h"
#include "scumm/smush/codec37.h"
#include "scumm/smush/codec47.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "scumm/sound.h"
namespace Scumm {