Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/

svn-id: r47579

engines/agos/animation.cpp

@@ -40,7 +40,7 @@
 #include "agos/agos.h"
 
 #include "sound/audiostream.h"
-#include "sound/wave.h"
+#include "sound/decoders/wave.h"
 
 #include "gui/message.h"
 

engines/agos/sound.cpp

@@ -30,13 +30,13 @@
 #include "agos/sound.h"
 
 #include "sound/audiostream.h"
-#include "sound/flac.h"
+#include "sound/decoders/flac.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"
 
 using Common::File;
 

engines/cine/sound.cpp

@@ -32,7 +32,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/fmopl.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 #include "sound/mods/soundfx.h"
 
 namespace Cine {

engines/draci/sound.cpp

@@ -35,7 +35,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Draci {
 

engines/drascula/sound.cpp

@@ -26,8 +26,8 @@
 #include "sound/audiocd.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
-#include "sound/voc.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/voc.h"
 
 #include "common/config-manager.h"
 

engines/gob/sound/sounddesc.cpp

@@ -26,8 +26,8 @@
 #include "common/util.h"
 #include "common/stream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
-#include "sound/wave.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/wave.h"
 
 #include "gob/sound/sounddesc.h"
 #include "gob/resources.h"

engines/gob/sound/soundmixer.cpp

@@ -26,7 +26,7 @@
 #include "gob/sound/soundmixer.h"
 #include "gob/sound/sounddesc.h"
 
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Gob {
 

engines/groovie/roq.cpp

@@ -36,7 +36,7 @@
 #include "graphics/conversion.h"
 #endif
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Groovie {
 

engines/groovie/vdx.cpp

@@ -28,7 +28,7 @@
 #include "groovie/vdx.h"
 
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 #define TILE_SIZE 4			// Size of each tile on the image: only ever seen 4 so far
 #define VDX_IDENT 0x9267	// 37479

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"

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 {
 

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 {
 

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"
 

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"

engines/m4/sound.cpp

@@ -31,7 +31,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace M4 {
 

engines/m4/sound.h

@@ -31,9 +31,9 @@
 #include "common/file.h"
 #include "common/array.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 M4 {
 

engines/made/made.h

@@ -40,7 +40,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/voc.h"
+#include "sound/decoders/voc.h"
 #include "sound/audiocd.h"
 
 #include "engines/engine.h"

engines/made/pmvplayer.cpp

@@ -26,7 +26,7 @@
 #include "made/pmvplayer.h"
 #include "made/screen.h"
 
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Made {
 

engines/made/resource.cpp

@@ -25,7 +25,7 @@
 
 #include "common/endian.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 #include "made/resource.h"
 #include "made/graphics.h"

engines/mohawk/sound.cpp

@@ -28,9 +28,9 @@
 #include "common/util.h"
 
 #include "sound/audiostream.h"
-#include "sound/mp3.h"
-#include "sound/raw.h"
-#include "sound/wave.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/wave.h"
 
 
 namespace Mohawk {

engines/mohawk/sound.h

@@ -30,7 +30,7 @@
 #include "common/str.h"
 
 #include "sound/audiostream.h"
-#include "sound/adpcm.h"
+#include "sound/decoders/adpcm.h"
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
 #include "sound/mixer.h"

engines/mohawk/video/qt_player.cpp

@@ -39,8 +39,8 @@
 #include "common/zlib.h"
 
 // Audio codecs
-#include "sound/adpcm.h"
-#include "sound/raw.h"
+#include "sound/decoders/adpcm.h"
+#include "sound/decoders/raw.h"
 #include "mohawk/video/qdm2.h"
 
 // Video codecs

engines/parallaction/sound.h

@@ -30,7 +30,7 @@
 #include "common/mutex.h"
 
 #include "sound/audiostream.h"
-#include "sound/iff_sound.h"
+#include "sound/decoders/iff_sound.h"
 #include "sound/mixer.h"
 #include "sound/mididrv.h"
 

engines/parallaction/sound_br.cpp

@@ -31,7 +31,7 @@
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
 #include "sound/mods/protracker.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 #include "parallaction/disk.h"
 #include "parallaction/parallaction.h"

engines/parallaction/sound_ns.cpp

@@ -30,7 +30,7 @@
 #include "sound/mixer.h"
 #include "sound/midiparser.h"
 #include "sound/mods/protracker.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 #include "parallaction/sound.h"
 #include "parallaction/parallaction.h"

engines/queen/sound.cpp

@@ -36,11 +36,11 @@
 #include "queen/resource.h"
 
 #include "sound/audiostream.h"
-#include "sound/flac.h"
+#include "sound/decoders/flac.h"
 #include "sound/mididrv.h"
-#include "sound/mp3.h"
-#include "sound/raw.h"
-#include "sound/vorbis.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/vorbis.h"
 
 #define	SB_HEADER_SIZE_V104 110
 #define	SB_HEADER_SIZE_V110 122

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"
 

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 {

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 {
 

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 {
 

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 {
 

engines/sci/sound/audio.cpp

@@ -32,8 +32,8 @@
 
 #include "sound/audiostream.h"
 #include "sound/audiocd.h"
-#include "sound/raw.h"
-#include "sound/wave.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/wave.h"
 
 namespace Sci {
 

engines/sci/sound/iterator/iterator.cpp

@@ -36,7 +36,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Sci {
 

engines/sci/sound/music.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "sound/audiostream.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 #include "common/config-manager.h"
 
 #include "sci/sci.h"

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"

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"

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 {
 

engines/scumm/imuse_digi/dimuse.cpp

@@ -35,7 +35,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Scumm {
 

engines/scumm/imuse_digi/dimuse_sndmgr.cpp

@@ -26,10 +26,10 @@
 #include "common/scummsys.h"
 #include "common/util.h"
 
-#include "sound/flac.h"
-#include "sound/voc.h"
-#include "sound/vorbis.h"
-#include "sound/mp3.h"
+#include "sound/decoders/flac.h"
+#include "sound/decoders/voc.h"
+#include "sound/decoders/vorbis.h"
+#include "sound/decoders/mp3.h"
 
 #include "scumm/scumm.h"
 #include "scumm/util.h"

engines/scumm/player_mod.cpp

@@ -27,7 +27,7 @@
 #include "scumm/player_mod.h"
 #include "sound/mixer.h"
 #include "sound/rate.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Scumm {
 

engines/scumm/smush/smush_mixer.cpp

@@ -33,7 +33,7 @@
 #include "scumm/imuse/imuse.h"
 
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 
 namespace Scumm {

engines/scumm/smush/smush_player.cpp

@@ -50,9 +50,9 @@
 #include "scumm/insane/insane.h"
 
 #include "sound/mixer.h"
-#include "sound/mp3.h"
-#include "sound/raw.h"
-#include "sound/vorbis.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/vorbis.h"
 
 #include "common/zlib.h"
 

engines/scumm/sound.cpp

@@ -35,16 +35,16 @@
 #include "scumm/sound.h"
 #include "scumm/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 {
 

engines/sky/intro.cpp

@@ -39,7 +39,7 @@
 #include "sky/text.h"
 
 #include "sound/audiostream.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Sky {
 

engines/sky/sound.cpp

@@ -34,7 +34,7 @@
 #include "sky/struc.h"
 
 #include "sound/audiostream.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Sky {
 

engines/sword1/animation.cpp

@@ -28,7 +28,7 @@
 #include "sword1/sword1.h"
 #include "sword1/animation.h"
 #include "sword1/text.h"
-#include "sound/vorbis.h"
+#include "sound/decoders/vorbis.h"
 
 #include "common/config-manager.h"
 #include "common/endian.h"

engines/sword1/music.cpp

@@ -32,13 +32,13 @@
 #include "sword1/sword1.h"
 #include "sword1/music.h"
 
-#include "sound/aiff.h"
-#include "sound/flac.h"
 #include "sound/mixer.h"
-#include "sound/mp3.h"
-#include "sound/vorbis.h"
-#include "sound/wave.h"
-#include "sound/vag.h"
+#include "sound/decoders/aiff.h"
+#include "sound/decoders/flac.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/vorbis.h"
+#include "sound/decoders/wave.h"
+#include "sound/decoders/vag.h"
 
 #define SMP_BUFSIZE 8192
 

engines/sword1/sound.cpp

@@ -36,12 +36,12 @@
 #include "sword1/logic.h"
 #include "sword1/sword1.h"
 
-#include "sound/flac.h"
-#include "sound/mp3.h"
-#include "sound/raw.h"
-#include "sound/vorbis.h"
-#include "sound/wave.h"
-#include "sound/vag.h"
+#include "sound/decoders/flac.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/vorbis.h"
+#include "sound/decoders/wave.h"
+#include "sound/decoders/vag.h"
 
 namespace Sword1 {
 

engines/sword2/music.cpp

@@ -35,12 +35,12 @@
 #include "common/file.h"
 #include "common/system.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 "sound/decoders/wave.h"
+#include "sound/decoders/vag.h"
 #include "sound/rate.h"
-#include "sound/wave.h"
-#include "sound/vag.h"
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"

engines/sword2/sound.cpp

@@ -46,8 +46,8 @@
 #include "sword2/resman.h"
 #include "sword2/sound.h"
 
-#include "sound/wave.h"
-#include "sound/vag.h"
+#include "sound/decoders/wave.h"
+#include "sound/decoders/vag.h"
 
 namespace Sword2 {
 

engines/teenagent/teenagent.cpp

@@ -29,7 +29,7 @@
 #include "common/system.h"
 #include "engines/advancedDetector.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 #include "graphics/cursorman.h"
 #include "graphics/thumbnail.h"
 #include "teenagent/console.h"

engines/tinsel/bmv.cpp

@@ -42,7 +42,7 @@
 #include "tinsel/tinlib.h"
 #include "tinsel/tinsel.h"
 
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Tinsel {
 

engines/tinsel/music.cpp

@@ -31,7 +31,7 @@
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
 #include "sound/audiocd.h"
-#include "sound/adpcm.h"
+#include "sound/decoders/adpcm.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 

engines/tinsel/sound.cpp

@@ -39,12 +39,12 @@
 #include "common/system.h"
 
 #include "sound/mixer.h"
-#include "sound/adpcm.h"
-#include "sound/vag.h"
-#include "sound/flac.h"
-#include "sound/mp3.h"
-#include "sound/raw.h"
-#include "sound/vorbis.h"
+#include "sound/decoders/adpcm.h"
+#include "sound/decoders/flac.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/vag.h"
+#include "sound/decoders/vorbis.h"
 
 #include "gui/message.h"
 

engines/touche/resource.cpp

@@ -25,12 +25,12 @@
 
 
 
-#include "sound/flac.h"
+#include "sound/decoders/flac.h"
 #include "sound/mixer.h"
-#include "sound/mp3.h"
-#include "sound/voc.h"
-#include "sound/vorbis.h"
-#include "sound/raw.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/voc.h"
+#include "sound/decoders/vorbis.h"
+#include "sound/decoders/raw.h"
 #include "sound/audiostream.h"
 
 #include "touche/midi.h"

engines/tucker/resource.cpp

@@ -26,10 +26,10 @@
 #include "common/file.h"
 
 #include "sound/audiostream.h"
-#include "sound/flac.h"
-#include "sound/mp3.h"
-#include "sound/vorbis.h"
-#include "sound/wave.h"
+#include "sound/decoders/flac.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/vorbis.h"
+#include "sound/decoders/wave.h"
 
 #include "tucker/tucker.h"
 #include "tucker/graphics.h"

engines/tucker/sequences.cpp

@@ -26,8 +26,8 @@
 #include "common/system.h"
 
 #include "sound/audiostream.h"
-#include "sound/raw.h"
-#include "sound/wave.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/wave.h"
 
 #include "tucker/tucker.h"
 #include "tucker/graphics.h"

graphics/video/avi_decoder.cpp

@@ -31,7 +31,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 #include "graphics/video/avi_decoder.h"
 

graphics/video/coktelvideo/coktelvideo.cpp

@@ -34,7 +34,7 @@
 #include "graphics/video/coktelvideo/indeo3.h"
 
 #include "sound/audiostream.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Graphics {
 

graphics/video/smk_decoder.cpp

@@ -37,7 +37,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Graphics {
 

sound/audiocd.cpp

@@ -25,9 +25,9 @@
 
 #include "sound/audiocd.h"
 #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"
 #include "engines/engine.h"
 #include "common/util.h"
 #include "common/system.h"

sound/audiostream.cpp

@@ -30,11 +30,11 @@
 #include "common/util.h"
 
 #include "sound/audiostream.h"
-#include "sound/flac.h"
+#include "sound/decoders/flac.h"
 #include "sound/mixer.h"
-#include "sound/mp3.h"
-#include "sound/raw.h"
-#include "sound/vorbis.h"
+#include "sound/decoders/mp3.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/vorbis.h"
 
 
 namespace Audio {

sound/decoders/adpcm.cpp

@@ -25,7 +25,7 @@
 
 #include "common/endian.h"
 
-#include "sound/adpcm.h"
+#include "sound/decoders/adpcm.h"
 #include "sound/audiostream.h"
 
 

sound/decoders/aiff.cpp

@@ -35,10 +35,10 @@
 #include "common/util.h"
 #include "common/stream.h"
 
-#include "sound/aiff.h"
+#include "sound/decoders/aiff.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Audio {
 

sound/decoders/flac.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/flac.h"
+#include "sound/decoders/flac.h"
 
 #ifdef USE_FLAC
 

sound/decoders/iff_sound.cpp

@@ -23,10 +23,10 @@
  *
  */
 
-#include "sound/iff_sound.h"
+#include "sound/decoders/iff_sound.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 #include "common/iff_container.h"
 #include "common/func.h"
 

sound/decoders/mp3.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/mp3.h"
+#include "sound/decoders/mp3.h"
 
 #ifdef USE_MAD
 

sound/decoders/raw.cpp

@@ -28,7 +28,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Audio {
 

sound/decoders/shorten.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/shorten.h"
+#include "sound/decoders/shorten.h"
 
 #ifdef SOUND_SHORTEN_H
 
@@ -38,7 +38,7 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
+#include "sound/decoders/raw.h"
 
 namespace Audio {
 

sound/decoders/vag.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/vag.h"
+#include "sound/decoders/vag.h"
 
 namespace Audio {
 

sound/decoders/vag.h

@@ -28,6 +28,7 @@
  * Sound decoder used in engines:
  * - sword1 (PSX port of the game)
  * - sword2 (PSX port of the game)
+ * - tinsel (PSX port of the game)
  */
 
 #ifndef SOUND_VAG_H

sound/decoders/voc.cpp

@@ -30,8 +30,8 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/raw.h"
-#include "sound/voc.h"
+#include "sound/decoders/raw.h"
+#include "sound/decoders/voc.h"
 
 
 namespace Audio {

sound/decoders/vorbis.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/vorbis.h"
+#include "sound/decoders/vorbis.h"
 
 #ifdef USE_VORBIS
 

sound/decoders/wave.cpp

@@ -29,9 +29,9 @@
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
-#include "sound/wave.h"
-#include "sound/adpcm.h"
-#include "sound/raw.h"
+#include "sound/decoders/wave.h"
+#include "sound/decoders/adpcm.h"
+#include "sound/decoders/raw.h"
 
 namespace Audio {
 

sound/module.mk

@@ -1,29 +1,29 @@
 MODULE := sound
 
 MODULE_OBJS := \
-	adpcm.o \
-	aiff.o \
 	audiocd.o \
 	audiostream.o \
-	iff_sound.o \
-	flac.o \
 	fmopl.o \
 	mididrv.o \
-	midiparser.o \
 	midiparser_smf.o \
 	midiparser_xmidi.o \
+	midiparser.o \
 	mixer.o \
-	mp3.o \
 	mpu401.o \
 	musicplugin.o \
 	null.o \
-	raw.o \
-	shorten.o \
 	timestamp.o \
-	vag.o \
-	voc.o \
-	vorbis.o \
-	wave.o \
+	decoders/adpcm.o \
+	decoders/aiff.o \
+	decoders/flac.o \
+	decoders/iff_sound.o \
+	decoders/mp3.o \
+	decoders/raw.o \
+	decoders/shorten.o \
+	decoders/vag.o \
+	decoders/voc.o \
+	decoders/vorbis.o \
+	decoders/wave.o \
 	mods/infogrames.o \
 	mods/maxtrax.o \
 	mods/module.o \