aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/he
diff options
context:
space:
mode:
authorMax Horn2010-01-26 22:48:45 +0000
committerMax Horn2010-01-26 22:48:45 +0000
commit1565f14bc13a63aee6a42cc4fac3fe7fa39eda44 (patch)
tree41b4b65eb29718398f148dc6f7a6e131376fcc27 /engines/scumm/he
parente0d05a482ce93e029888ef388dfb1b90b438f2ee (diff)
downloadscummvm-rg350-1565f14bc13a63aee6a42cc4fac3fe7fa39eda44.tar.gz
scummvm-rg350-1565f14bc13a63aee6a42cc4fac3fe7fa39eda44.tar.bz2
scummvm-rg350-1565f14bc13a63aee6a42cc4fac3fe7fa39eda44.zip
Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/
svn-id: r47579
Diffstat (limited to 'engines/scumm/he')
-rw-r--r--engines/scumm/he/cup_player_he.cpp2
-rw-r--r--engines/scumm/he/resource_he.cpp2
-rw-r--r--engines/scumm/he/sound_he.cpp14
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index c3dea409e5..f785cf8282 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -28,7 +28,7 @@
#include "common/system.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
#include "scumm/scumm.h"
#include "scumm/util.h"
#include "scumm/he/intern_he.h"
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 9fc9dd4baf..967acebc1e 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -31,7 +31,7 @@
#include "scumm/he/resource_he.h"
#include "scumm/he/sound_he.h"
-#include "sound/wave.h"
+#include "sound/decoders/wave.h"
#include "graphics/cursorman.h"
#include "common/archive.h"
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 69e18fee76..54a2440697 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -35,16 +35,16 @@
#include "common/timer.h"
#include "common/util.h"
-#include "sound/adpcm.h"
+#include "sound/decoders/adpcm.h"
#include "sound/audiocd.h"
-#include "sound/flac.h"
+#include "sound/decoders/flac.h"
#include "sound/mididrv.h"
#include "sound/mixer.h"
-#include "sound/mp3.h"
-#include "sound/raw.h"
-#include "sound/voc.h"
-#include "sound/vorbis.h"
-#include "sound/wave.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/voc.h"
+#include "sound/decoders/vorbis.h"
+#include "sound/decoders/wave.h"
namespace Scumm {