diff options
85 files changed, 174 insertions, 173 deletions
diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index 2072baee26..0859bc9da3 100644 --- a/engines/agos/animation.cpp +++ b/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" diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index 82681378eb..39e250a3b2 100644 --- a/engines/agos/sound.cpp +++ b/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; diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index 2184e7a961..b260e7a48e 100644 --- a/engines/cine/sound.cpp +++ b/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 { diff --git a/engines/draci/sound.cpp b/engines/draci/sound.cpp index 0bf13af28f..826b4bdfa6 100644 --- a/engines/draci/sound.cpp +++ b/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 { diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp index 2893fba728..811014100e 100644 --- a/engines/drascula/sound.cpp +++ b/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" diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp index 6cd55678cf..2efb3e90f2 100644 --- a/engines/gob/sound/sounddesc.cpp +++ b/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" diff --git a/engines/gob/sound/soundmixer.cpp b/engines/gob/sound/soundmixer.cpp index 0feefb8af4..ea94a095bb 100644 --- a/engines/gob/sound/soundmixer.cpp +++ b/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 { diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 937e2b4e91..0766f4f021 100644 --- a/engines/groovie/roq.cpp +++ b/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 { diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp index cef70e77b6..cb3bc59cb1 100644 --- a/engines/groovie/vdx.cpp +++ b/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 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" diff --git a/engines/m4/sound.cpp b/engines/m4/sound.cpp index 06d73a9ac7..6f83c6b6d5 100644 --- a/engines/m4/sound.cpp +++ b/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 { diff --git a/engines/m4/sound.h b/engines/m4/sound.h index 2dae502551..caa5cfcca3 100644 --- a/engines/m4/sound.h +++ b/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 { diff --git a/engines/made/made.h b/engines/made/made.h index 42fd79fe6a..4d10df38f5 100644 --- a/engines/made/made.h +++ b/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" diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp index 5e96fdc206..20237501d9 100644 --- a/engines/made/pmvplayer.cpp +++ b/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 { diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp index b5f7b48fcd..39e9ae859c 100644 --- a/engines/made/resource.cpp +++ b/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" diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index 9d7dc3ae49..97ad3e6c20 100644 --- a/engines/mohawk/sound.cpp +++ b/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 { diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h index 9757f15095..d46081137e 100644 --- a/engines/mohawk/sound.h +++ b/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" diff --git a/engines/mohawk/video/qt_player.cpp b/engines/mohawk/video/qt_player.cpp index cddecbae9e..85c9e5f658 100644 --- a/engines/mohawk/video/qt_player.cpp +++ b/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 diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h index cefecd42b6..985ed77ccc 100644 --- a/engines/parallaction/sound.h +++ b/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" diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp index c03d4a19ce..75629b268a 100644 --- a/engines/parallaction/sound_br.cpp +++ b/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" diff --git a/engines/parallaction/sound_ns.cpp b/engines/parallaction/sound_ns.cpp index 939b52a767..fabb4a8d07 100644 --- a/engines/parallaction/sound_ns.cpp +++ b/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" diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index 619efcf6db..0a49dab0b2 100644 --- a/engines/queen/sound.cpp +++ b/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 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 { diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index 306cb0df46..d80d4cd348 100644 --- a/engines/sci/sound/audio.cpp +++ b/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 { diff --git a/engines/sci/sound/iterator/iterator.cpp b/engines/sci/sound/iterator/iterator.cpp index b1adb55896..620865c170 100644 --- a/engines/sci/sound/iterator/iterator.cpp +++ b/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 { diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 1d8313f6f0..740c3c43a5 100644 --- a/engines/sci/sound/music.cpp +++ b/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" 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 { diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index d087347211..e84ae41d14 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/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 { diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index 76e606af5b..e1e6083db9 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/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" diff --git a/engines/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp index be7abea47c..aeb882296d 100644 --- a/engines/scumm/player_mod.cpp +++ b/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 { diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp index 33285c7626..b40a76ac11 100644 --- a/engines/scumm/smush/smush_mixer.cpp +++ b/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 { diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index e8470aaf04..a81e385890 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/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" diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 6760072ed7..e4f5144eeb 100644 --- a/engines/scumm/sound.cpp +++ b/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 { diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index 4b8e09272a..a1b97b6b1b 100644 --- a/engines/sky/intro.cpp +++ b/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 { diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index 5b7f59c772..caa94506dc 100644 --- a/engines/sky/sound.cpp +++ b/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 { diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index b3c90e3204..2c2c92bb8d 100644 --- a/engines/sword1/animation.cpp +++ b/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" diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index 9d74e6a3f2..a10e705656 100644 --- a/engines/sword1/music.cpp +++ b/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 diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index 88c50f8121..43a5b25d76 100644 --- a/engines/sword1/sound.cpp +++ b/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 { diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index e5936bb958..a7d5bf50c2 100644 --- a/engines/sword2/music.cpp +++ b/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" diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp index 2d02a2d3ba..5de38fde9c 100644 --- a/engines/sword2/sound.cpp +++ b/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 { diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp index 19f4ef1613..0e637e0065 100644 --- a/engines/teenagent/teenagent.cpp +++ b/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" diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index 0324fdb5b9..7f3386edfa 100644 --- a/engines/tinsel/bmv.cpp +++ b/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 { diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 7eee6b0aa8..f30eabe267 100644 --- a/engines/tinsel/music.cpp +++ b/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" diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 1914f4d696..ccb978f45e 100644 --- a/engines/tinsel/sound.cpp +++ b/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" diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp index b56103ca03..45329c5612 100644 --- a/engines/touche/resource.cpp +++ b/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" diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp index e1bca03724..50dcc7f5d6 100644 --- a/engines/tucker/resource.cpp +++ b/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" diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp index 9f380cb409..c7de194436 100644 --- a/engines/tucker/sequences.cpp +++ b/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" diff --git a/graphics/video/avi_decoder.cpp b/graphics/video/avi_decoder.cpp index 5d310749d9..cfc48e20e4 100644 --- a/graphics/video/avi_decoder.cpp +++ b/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" diff --git a/graphics/video/coktelvideo/coktelvideo.cpp b/graphics/video/coktelvideo/coktelvideo.cpp index e3bf3f8493..7092826bf8 100644 --- a/graphics/video/coktelvideo/coktelvideo.cpp +++ b/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 { diff --git a/graphics/video/smk_decoder.cpp b/graphics/video/smk_decoder.cpp index 437d72e5df..28fc547010 100644 --- a/graphics/video/smk_decoder.cpp +++ b/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 { diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp index 836f92b33d..bd2d4d46f0 100644 --- a/sound/audiocd.cpp +++ b/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" diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 20f4d4d14e..e781149a55 100644 --- a/sound/audiostream.cpp +++ b/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 { diff --git a/sound/adpcm.cpp b/sound/decoders/adpcm.cpp index ef8bb50c98..898780350b 100644 --- a/sound/adpcm.cpp +++ b/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" diff --git a/sound/adpcm.h b/sound/decoders/adpcm.h index 46ccb582c3..46ccb582c3 100644 --- a/sound/adpcm.h +++ b/sound/decoders/adpcm.h diff --git a/sound/aiff.cpp b/sound/decoders/aiff.cpp index 6f0e943ac3..e474e999d0 100644 --- a/sound/aiff.cpp +++ b/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 { diff --git a/sound/aiff.h b/sound/decoders/aiff.h index e8a3b6f0b0..e8a3b6f0b0 100644 --- a/sound/aiff.h +++ b/sound/decoders/aiff.h diff --git a/sound/flac.cpp b/sound/decoders/flac.cpp index eb195e0c7b..29302827da 100644 --- a/sound/flac.cpp +++ b/sound/decoders/flac.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/flac.h" +#include "sound/decoders/flac.h" #ifdef USE_FLAC diff --git a/sound/flac.h b/sound/decoders/flac.h index e35b608253..e35b608253 100644 --- a/sound/flac.h +++ b/sound/decoders/flac.h diff --git a/sound/iff_sound.cpp b/sound/decoders/iff_sound.cpp index 9a254cd593..f394b55ef0 100644 --- a/sound/iff_sound.cpp +++ b/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" diff --git a/sound/iff_sound.h b/sound/decoders/iff_sound.h index 4e53059380..4e53059380 100644 --- a/sound/iff_sound.h +++ b/sound/decoders/iff_sound.h diff --git a/sound/mp3.cpp b/sound/decoders/mp3.cpp index 26f0e6d320..378f77dac0 100644 --- a/sound/mp3.cpp +++ b/sound/decoders/mp3.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/mp3.h" +#include "sound/decoders/mp3.h" #ifdef USE_MAD diff --git a/sound/mp3.h b/sound/decoders/mp3.h index 3175df5e92..3175df5e92 100644 --- a/sound/mp3.h +++ b/sound/decoders/mp3.h diff --git a/sound/raw.cpp b/sound/decoders/raw.cpp index 46346f1577..6747111a1a 100644 --- a/sound/raw.cpp +++ b/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 { diff --git a/sound/raw.h b/sound/decoders/raw.h index 16ab4ec350..16ab4ec350 100644 --- a/sound/raw.h +++ b/sound/decoders/raw.h diff --git a/sound/shorten.cpp b/sound/decoders/shorten.cpp index c3893ebc0a..fc97f71b56 100644 --- a/sound/shorten.cpp +++ b/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 { diff --git a/sound/shorten.h b/sound/decoders/shorten.h index bc9f229687..bc9f229687 100644 --- a/sound/shorten.h +++ b/sound/decoders/shorten.h diff --git a/sound/vag.cpp b/sound/decoders/vag.cpp index c4ff55efa2..f2c9281d80 100644 --- a/sound/vag.cpp +++ b/sound/decoders/vag.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/vag.h" +#include "sound/decoders/vag.h" namespace Audio { diff --git a/sound/vag.h b/sound/decoders/vag.h index bd3b174729..d659a7db4e 100644 --- a/sound/vag.h +++ b/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 diff --git a/sound/voc.cpp b/sound/decoders/voc.cpp index 295498230a..65dd1a3998 100644 --- a/sound/voc.cpp +++ b/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 { diff --git a/sound/voc.h b/sound/decoders/voc.h index 191f42db02..191f42db02 100644 --- a/sound/voc.h +++ b/sound/decoders/voc.h diff --git a/sound/vorbis.cpp b/sound/decoders/vorbis.cpp index 4ce2f2c3f7..46a94a6214 100644 --- a/sound/vorbis.cpp +++ b/sound/decoders/vorbis.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/vorbis.h" +#include "sound/decoders/vorbis.h" #ifdef USE_VORBIS diff --git a/sound/vorbis.h b/sound/decoders/vorbis.h index dd0a89bfdd..dd0a89bfdd 100644 --- a/sound/vorbis.h +++ b/sound/decoders/vorbis.h diff --git a/sound/wave.cpp b/sound/decoders/wave.cpp index 45974cf69c..c0865ad30f 100644 --- a/sound/wave.cpp +++ b/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 { diff --git a/sound/wave.h b/sound/decoders/wave.h index f0e3bb249b..f0e3bb249b 100644 --- a/sound/wave.h +++ b/sound/decoders/wave.h diff --git a/sound/module.mk b/sound/module.mk index e21f242974..1506d46c80 100644 --- a/sound/module.mk +++ b/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 \ |