aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
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/kyra
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/kyra')
-rw-r--r--engines/kyra/lol.cpp2
-rw-r--r--engines/kyra/sound.cpp10
-rw-r--r--engines/kyra/sound_digital.cpp6
-rw-r--r--engines/kyra/sound_towns.cpp2
-rw-r--r--engines/kyra/vqa.cpp2
5 files changed, 11 insertions, 11 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index be5a755200..db49a70eca 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -34,7 +34,7 @@
#include "kyra/util.h"
#include "kyra/debugger.h"
-#include "sound/voc.h"
+#include "sound/decoders/voc.h"
#include "sound/audiostream.h"
#include "common/config-manager.h"
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index d9058a5dc3..af33d893d5 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -31,13 +31,13 @@
#include "kyra/sound.h"
#include "sound/mixer.h"
-#include "sound/voc.h"
+#include "sound/decoders/voc.h"
#include "sound/audiostream.h"
-#include "sound/flac.h"
-#include "sound/mp3.h"
-#include "sound/raw.h"
-#include "sound/vorbis.h"
+#include "sound/decoders/flac.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/vorbis.h"
namespace Kyra {
diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp
index 7f659e914e..393a2f3eda 100644
--- a/engines/kyra/sound_digital.cpp
+++ b/engines/kyra/sound_digital.cpp
@@ -29,9 +29,9 @@
#include "sound/audiostream.h"
-#include "sound/mp3.h"
-#include "sound/vorbis.h"
-#include "sound/flac.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/vorbis.h"
+#include "sound/decoders/flac.h"
namespace Kyra {
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 7b4a15dc4a..ec9d46ff5d 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -30,7 +30,7 @@
#include "sound/audiocd.h"
#include "sound/audiostream.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
#include "common/util.h"
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp
index 6ef591fae8..354bfbb425 100644
--- a/engines/kyra/vqa.cpp
+++ b/engines/kyra/vqa.cpp
@@ -37,7 +37,7 @@
#include "common/system.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
#include "kyra/sound.h"
#include "kyra/screen.h"