From 1565f14bc13a63aee6a42cc4fac3fe7fa39eda44 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 26 Jan 2010 22:48:45 +0000 Subject: [PATCH] Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/ svn-id: r47579 --- engines/agos/animation.cpp | 2 +- engines/agos/sound.cpp | 12 +++++------ engines/cine/sound.cpp | 2 +- engines/draci/sound.cpp | 2 +- engines/drascula/sound.cpp | 4 ++-- engines/gob/sound/sounddesc.cpp | 4 ++-- engines/gob/sound/soundmixer.cpp | 2 +- engines/groovie/roq.cpp | 2 +- engines/groovie/vdx.cpp | 2 +- engines/kyra/lol.cpp | 2 +- engines/kyra/sound.cpp | 10 ++++----- engines/kyra/sound_digital.cpp | 6 +++--- engines/kyra/sound_towns.cpp | 2 +- engines/kyra/vqa.cpp | 2 +- engines/m4/sound.cpp | 2 +- engines/m4/sound.h | 6 +++--- engines/made/made.h | 2 +- engines/made/pmvplayer.cpp | 2 +- engines/made/resource.cpp | 2 +- engines/mohawk/sound.cpp | 6 +++--- engines/mohawk/sound.h | 2 +- engines/mohawk/video/qt_player.cpp | 4 ++-- engines/parallaction/sound.h | 2 +- engines/parallaction/sound_br.cpp | 2 +- engines/parallaction/sound_ns.cpp | 2 +- engines/queen/sound.cpp | 8 ++++---- 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 +++--- engines/sci/sound/audio.cpp | 4 ++-- engines/sci/sound/iterator/iterator.cpp | 2 +- engines/sci/sound/music.cpp | 2 +- engines/scumm/he/cup_player_he.cpp | 2 +- engines/scumm/he/resource_he.cpp | 2 +- engines/scumm/he/sound_he.cpp | 14 ++++++------- engines/scumm/imuse_digi/dimuse.cpp | 2 +- engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 8 ++++---- engines/scumm/player_mod.cpp | 2 +- engines/scumm/smush/smush_mixer.cpp | 2 +- engines/scumm/smush/smush_player.cpp | 6 +++--- engines/scumm/sound.cpp | 14 ++++++------- engines/sky/intro.cpp | 2 +- engines/sky/sound.cpp | 2 +- engines/sword1/animation.cpp | 2 +- engines/sword1/music.cpp | 12 +++++------ engines/sword1/sound.cpp | 12 +++++------ engines/sword2/music.cpp | 10 ++++----- engines/sword2/sound.cpp | 4 ++-- engines/teenagent/teenagent.cpp | 2 +- engines/tinsel/bmv.cpp | 2 +- engines/tinsel/music.cpp | 2 +- engines/tinsel/sound.cpp | 12 +++++------ engines/touche/resource.cpp | 10 ++++----- engines/tucker/resource.cpp | 8 ++++---- engines/tucker/sequences.cpp | 4 ++-- graphics/video/avi_decoder.cpp | 2 +- graphics/video/coktelvideo/coktelvideo.cpp | 2 +- graphics/video/smk_decoder.cpp | 2 +- sound/audiocd.cpp | 6 +++--- sound/audiostream.cpp | 8 ++++---- sound/{ => decoders}/adpcm.cpp | 2 +- sound/{ => decoders}/adpcm.h | 0 sound/{ => decoders}/aiff.cpp | 4 ++-- sound/{ => decoders}/aiff.h | 0 sound/{ => decoders}/flac.cpp | 2 +- sound/{ => decoders}/flac.h | 0 sound/{ => decoders}/iff_sound.cpp | 4 ++-- sound/{ => decoders}/iff_sound.h | 0 sound/{ => decoders}/mp3.cpp | 2 +- sound/{ => decoders}/mp3.h | 0 sound/{ => decoders}/raw.cpp | 2 +- sound/{ => decoders}/raw.h | 0 sound/{ => decoders}/shorten.cpp | 4 ++-- sound/{ => decoders}/shorten.h | 0 sound/{ => decoders}/vag.cpp | 2 +- sound/{ => decoders}/vag.h | 1 + sound/{ => decoders}/voc.cpp | 4 ++-- sound/{ => decoders}/voc.h | 0 sound/{ => decoders}/vorbis.cpp | 2 +- sound/{ => decoders}/vorbis.h | 0 sound/{ => decoders}/wave.cpp | 6 +++--- sound/{ => decoders}/wave.h | 0 sound/module.mk | 24 +++++++++++----------- 85 files changed, 174 insertions(+), 173 deletions(-) rename sound/{ => decoders}/adpcm.cpp (99%) rename sound/{ => decoders}/adpcm.h (100%) rename sound/{ => decoders}/aiff.cpp (98%) rename sound/{ => decoders}/aiff.h (100%) rename sound/{ => decoders}/flac.cpp (99%) rename sound/{ => decoders}/flac.h (100%) rename sound/{ => decoders}/iff_sound.cpp (97%) rename sound/{ => decoders}/iff_sound.h (100%) rename sound/{ => decoders}/mp3.cpp (99%) rename sound/{ => decoders}/mp3.h (100%) rename sound/{ => decoders}/raw.cpp (99%) rename sound/{ => decoders}/raw.h (100%) rename sound/{ => decoders}/shorten.cpp (99%) rename sound/{ => decoders}/shorten.h (100%) rename sound/{ => decoders}/vag.cpp (98%) rename sound/{ => decoders}/vag.h (98%) rename sound/{ => decoders}/voc.cpp (99%) rename sound/{ => decoders}/voc.h (100%) rename sound/{ => decoders}/vorbis.cpp (99%) rename sound/{ => decoders}/vorbis.h (100%) rename sound/{ => decoders}/wave.cpp (98%) rename sound/{ => decoders}/wave.h (100%) diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index 2072baee263..0859bc9da3e 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 82681378eb8..39e250a3b20 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 2184e7a9618..b260e7a48ea 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 0bf13af28ff..826b4bdfa68 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 2893fba7280..811014100e5 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 6cd55678cfa..2efb3e90f25 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 0feefb8af48..ea94a095bbd 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 937e2b4e914..0766f4f0214 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 cef70e77b6d..cb3bc59cb17 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 be5a7552002..db49a70eca6 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 d9058a5dc31..af33d893d57 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 7f659e914ea..393a2f3eda2 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 7b4a15dc4ad..ec9d46ff5da 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 6ef591fae86..354bfbb425c 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 06d73a9ac7a..6f83c6b6d59 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 2dae5025510..caa5cfcca30 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 42fd79fe6a0..4d10df38f5c 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 5e96fdc206c..20237501d94 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 b5f7b48fcde..39e9ae859c5 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 9d7dc3ae49f..97ad3e6c202 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 9757f15095f..d46081137e2 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 cddecbae9e3..85c9e5f658e 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 cefecd42b6a..985ed77cccd 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 c03d4a19cec..75629b268a4 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 939b52a7672..fabb4a8d077 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 619efcf6db0..0a49dab0b26 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 afe4fb2a3b9..b51a387d614 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 44a87f28b38..22711ba1673 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 2a87df67119..c4852f31c39 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 642b07eb073..f8859ad5257 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 845c0ab573f..9cf8f297675 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 306cb0df463..d80d4cd3483 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 b1adb558968..620865c1704 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 1d8313f6f0d..740c3c43a58 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 c3dea409e5f..f785cf82822 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 9fc9dd4baf6..967acebc1e3 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 69e18fee761..54a2440697d 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 d0873472111..e84ae41d14d 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 76e606af5b2..e1e6083db90 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 be7abea47c5..aeb882296d6 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 33285c76264..b40a76ac115 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 e8470aaf04b..a81e3858904 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 6760072ed7c..e4f5144eeb1 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 4b8e09272a1..a1b97b6b1bb 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 5b7f59c7724..caa94506dcd 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 b3c90e3204d..2c2c92bb8db 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 9d74e6a3f2e..a10e7056560 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 88c50f81210..43a5b25d767 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 e5936bb9585..a7d5bf50c2a 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 2d02a2d3bad..5de38fde9ca 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 19f4ef16135..0e637e00652 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 0324fdb5b96..7f3386edfa4 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 7eee6b0aa85..f30eabe2675 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 1914f4d6967..ccb978f45e4 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 b56103ca034..45329c56124 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 e1bca037240..50dcc7f5d6f 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 9f380cb409c..c7de1944364 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 5d310749d97..cfc48e20e41 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 e3bf3f8493c..7092826bf81 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 437d72e5df4..28fc547010e 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 836f92b33dc..bd2d4d46f0e 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 20f4d4d14ed..e781149a558 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 similarity index 99% rename from sound/adpcm.cpp rename to sound/decoders/adpcm.cpp index ef8bb50c988..898780350ba 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 similarity index 100% rename from sound/adpcm.h rename to sound/decoders/adpcm.h diff --git a/sound/aiff.cpp b/sound/decoders/aiff.cpp similarity index 98% rename from sound/aiff.cpp rename to sound/decoders/aiff.cpp index 6f0e943ac32..e474e999d0f 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 similarity index 100% rename from sound/aiff.h rename to sound/decoders/aiff.h diff --git a/sound/flac.cpp b/sound/decoders/flac.cpp similarity index 99% rename from sound/flac.cpp rename to sound/decoders/flac.cpp index eb195e0c7b0..29302827dae 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 similarity index 100% rename from sound/flac.h rename to sound/decoders/flac.h diff --git a/sound/iff_sound.cpp b/sound/decoders/iff_sound.cpp similarity index 97% rename from sound/iff_sound.cpp rename to sound/decoders/iff_sound.cpp index 9a254cd593d..f394b55ef05 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 similarity index 100% rename from sound/iff_sound.h rename to sound/decoders/iff_sound.h diff --git a/sound/mp3.cpp b/sound/decoders/mp3.cpp similarity index 99% rename from sound/mp3.cpp rename to sound/decoders/mp3.cpp index 26f0e6d3206..378f77dac00 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 similarity index 100% rename from sound/mp3.h rename to sound/decoders/mp3.h diff --git a/sound/raw.cpp b/sound/decoders/raw.cpp similarity index 99% rename from sound/raw.cpp rename to sound/decoders/raw.cpp index 46346f15778..6747111a1ad 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 similarity index 100% rename from sound/raw.h rename to sound/decoders/raw.h diff --git a/sound/shorten.cpp b/sound/decoders/shorten.cpp similarity index 99% rename from sound/shorten.cpp rename to sound/decoders/shorten.cpp index c3893ebc0a6..fc97f71b564 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 similarity index 100% rename from sound/shorten.h rename to sound/decoders/shorten.h diff --git a/sound/vag.cpp b/sound/decoders/vag.cpp similarity index 98% rename from sound/vag.cpp rename to sound/decoders/vag.cpp index c4ff55efa23..f2c9281d809 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 similarity index 98% rename from sound/vag.h rename to sound/decoders/vag.h index bd3b1747297..d659a7db4e6 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 similarity index 99% rename from sound/voc.cpp rename to sound/decoders/voc.cpp index 295498230ae..65dd1a3998c 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 similarity index 100% rename from sound/voc.h rename to sound/decoders/voc.h diff --git a/sound/vorbis.cpp b/sound/decoders/vorbis.cpp similarity index 99% rename from sound/vorbis.cpp rename to sound/decoders/vorbis.cpp index 4ce2f2c3f7b..46a94a62145 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 similarity index 100% rename from sound/vorbis.h rename to sound/decoders/vorbis.h diff --git a/sound/wave.cpp b/sound/decoders/wave.cpp similarity index 98% rename from sound/wave.cpp rename to sound/decoders/wave.cpp index 45974cf69cf..c0865ad30fa 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 similarity index 100% rename from sound/wave.h rename to sound/decoders/wave.h diff --git a/sound/module.mk b/sound/module.mk index e21f2429746..1506d46c80e 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 \