From 1565f14bc13a63aee6a42cc4fac3fe7fa39eda44 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 26 Jan 2010 22:48:45 +0000
Subject: Moved audio stream implementations (for MP3, FLAC, etc.) to new dir
 sound/decoders/

svn-id: r47579
---
 engines/saga/music.cpp  |  2 +-
 engines/saga/music.h    |  6 +++---
 engines/saga/sndres.cpp | 12 ++++++------
 engines/saga/sound.cpp  |  4 ++--
 engines/saga/sound.h    |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'engines/saga')

diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index afe4fb2a3b..b51a387d61 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -33,7 +33,7 @@
 #include "sound/audiostream.h"
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 
diff --git a/engines/saga/music.h b/engines/saga/music.h
index 44a87f28b3..22711ba167 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -31,9 +31,9 @@
 #include "sound/audiocd.h"
 #include "sound/mididrv.h"
 #include "sound/midiparser.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"
 #include "common/mutex.h"
 
 namespace Saga {
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp
index 2a87df6711..c4852f31c3 100644
--- a/engines/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
@@ -35,14 +35,14 @@
 #include "common/file.h"
 
 #include "sound/audiostream.h"
-#include "sound/adpcm.h"
-#include "sound/aiff.h"
+#include "sound/decoders/adpcm.h"
+#include "sound/decoders/aiff.h"
 #ifdef ENABLE_SAGA2
-#include "sound/shorten.h"
+#include "sound/decoders/shorten.h"
 #endif
-#include "sound/raw.h"
-#include "sound/voc.h"
-#include "sound/wave.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/voc.h"
+#include "sound/decoders/wave.h"
 
 namespace Saga {
 
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp
index 642b07eb07..f8859ad525 100644
--- a/engines/saga/sound.cpp
+++ b/engines/saga/sound.cpp
@@ -30,8 +30,8 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/adpcm.h"
-#include "sound/raw.h"
+#include "sound/decoders/adpcm.h"
+#include "sound/decoders/raw.h"
 
 namespace Saga {
 
diff --git a/engines/saga/sound.h b/engines/saga/sound.h
index 845c0ab573..9cf8f29767 100644
--- a/engines/saga/sound.h
+++ b/engines/saga/sound.h
@@ -30,9 +30,9 @@
 
 #include "common/file.h"
 #include "sound/mixer.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 Saga {
 
-- 
cgit v1.2.3