diff options
Diffstat (limited to 'engines')
207 files changed, 458 insertions, 458 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 885704b9c6..fdc05f0ba9 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -40,8 +40,8 @@ #include "graphics/cursorman.h" -#include "sound/mididrv.h" -#include "sound/mixer.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" #include "agi/agi.h" #include "agi/graphics.h" diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp index 1a5698dffc..fe864d7659 100644 --- a/engines/agi/preagi.cpp +++ b/engines/agi/preagi.cpp @@ -27,7 +27,7 @@ #include "common/debug-channels.h" #include "common/random.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" #include "agi/preagi.h" #include "agi/graphics.h" diff --git a/engines/agi/preagi.h b/engines/agi/preagi.h index 45b50f2eed..58e08945b6 100644 --- a/engines/agi/preagi.h +++ b/engines/agi/preagi.h @@ -29,7 +29,7 @@ #include "agi/agi.h" #include "agi/preagi_common.h" -#include "sound/softsynth/pcspk.h" +#include "audio/softsynth/pcspk.h" namespace Agi { diff --git a/engines/agi/sound.h b/engines/agi/sound.h index 63b36e017c..b858493cb8 100644 --- a/engines/agi/sound.h +++ b/engines/agi/sound.h @@ -26,7 +26,7 @@ #ifndef AGI_SOUND_H #define AGI_SOUND_H -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Agi { diff --git a/engines/agi/sound_2gs.h b/engines/agi/sound_2gs.h index 12dede0b69..391646d6ce 100644 --- a/engines/agi/sound_2gs.h +++ b/engines/agi/sound_2gs.h @@ -27,7 +27,7 @@ #define AGI_SOUND_2GS_H #include "common/frac.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" namespace Agi { diff --git a/engines/agi/sound_coco3.h b/engines/agi/sound_coco3.h index b60f1937cd..a1cc271871 100644 --- a/engines/agi/sound_coco3.h +++ b/engines/agi/sound_coco3.h @@ -26,7 +26,7 @@ #ifndef AGI_SOUND_COCO3_H #define AGI_SOUND_COCO3_H -#include "sound/audiostream.h" +#include "audio/audiostream.h" namespace Agi { diff --git a/engines/agi/sound_midi.cpp b/engines/agi/sound_midi.cpp index 9011ecaa86..47cab0019f 100644 --- a/engines/agi/sound_midi.cpp +++ b/engines/agi/sound_midi.cpp @@ -42,9 +42,9 @@ // MIDI and digital music class -#include "sound/audiostream.h" -#include "sound/mididrv.h" -#include "sound/midiparser.h" +#include "audio/audiostream.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "common/config-manager.h" #include "common/file.h" #include "common/memstream.h" diff --git a/engines/agi/sound_midi.h b/engines/agi/sound_midi.h index 26b75e0d70..059d41208c 100644 --- a/engines/agi/sound_midi.h +++ b/engines/agi/sound_midi.h @@ -28,8 +28,8 @@ #ifndef AGI_SOUND_MIDI_H #define AGI_SOUND_MIDI_H -#include "sound/mididrv.h" -#include "sound/midiparser.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "common/mutex.h" namespace Agi { diff --git a/engines/agi/sound_pcjr.h b/engines/agi/sound_pcjr.h index fe0e762f4e..3aad29d2ce 100644 --- a/engines/agi/sound_pcjr.h +++ b/engines/agi/sound_pcjr.h @@ -26,7 +26,7 @@ #ifndef AGI_SOUND_PCJR_H #define AGI_SOUND_PCJR_H -#include "sound/audiostream.h" +#include "audio/audiostream.h" namespace Agi { diff --git a/engines/agi/sound_sarien.cpp b/engines/agi/sound_sarien.cpp index 4ede50a749..4ed7f8d029 100644 --- a/engines/agi/sound_sarien.cpp +++ b/engines/agi/sound_sarien.cpp @@ -29,7 +29,7 @@ #include "common/random.h" #include "common/str-array.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" #include "agi/agi.h" diff --git a/engines/agi/sound_sarien.h b/engines/agi/sound_sarien.h index 54222ba624..cea396255c 100644 --- a/engines/agi/sound_sarien.h +++ b/engines/agi/sound_sarien.h @@ -26,7 +26,7 @@ #ifndef AGI_SOUND_SARIEN_H #define AGI_SOUND_SARIEN_H -#include "sound/audiostream.h" +#include "audio/audiostream.h" namespace Agi { diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index d37a627da0..ae95bb0d2b 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -41,8 +41,8 @@ #include "graphics/surface.h" -#include "sound/mididrv.h" -#include "sound/mods/protracker.h" +#include "audio/mididrv.h" +#include "audio/mods/protracker.h" namespace AGOS { diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index cdb0fd2626..4c01f6b826 100644 --- a/engines/agos/animation.cpp +++ b/engines/agos/animation.cpp @@ -39,8 +39,8 @@ #include "agos/intern.h" #include "agos/agos.h" -#include "sound/audiostream.h" -#include "sound/decoders/wave.h" +#include "audio/audiostream.h" +#include "audio/decoders/wave.h" #include "gui/message.h" diff --git a/engines/agos/animation.h b/engines/agos/animation.h index ed22ffea5b..77b02ffd13 100644 --- a/engines/agos/animation.h +++ b/engines/agos/animation.h @@ -30,7 +30,7 @@ #include "video/dxa_decoder.h" #include "video/smk_decoder.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace AGOS { diff --git a/engines/agos/midi.h b/engines/agos/midi.h index d76997737a..9c8303ba3c 100644 --- a/engines/agos/midi.h +++ b/engines/agos/midi.h @@ -26,8 +26,8 @@ #ifndef AGOS_MIDI_H #define AGOS_MIDI_H -#include "sound/mididrv.h" -#include "sound/midiparser.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "common/mutex.h" namespace Common { diff --git a/engines/agos/midiparser_s1d.cpp b/engines/agos/midiparser_s1d.cpp index 568135ef8c..156dc6ecaa 100644 --- a/engines/agos/midiparser_s1d.cpp +++ b/engines/agos/midiparser_s1d.cpp @@ -26,8 +26,8 @@ #include "common/debug.h" #include "common/util.h" -#include "sound/mididrv.h" -#include "sound/midiparser.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" namespace AGOS { diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index 7f11367d0f..fe09e746ff 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -33,9 +33,9 @@ #include "backends/audiocd/audiocd.h" -#include "sound/audiostream.h" -#include "sound/mididrv.h" -#include "sound/mods/protracker.h" +#include "audio/audiostream.h" +#include "audio/mididrv.h" +#include "audio/mods/protracker.h" namespace AGOS { diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index 20deb47be8..35301793bf 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -30,14 +30,14 @@ #include "agos/agos.h" #include "agos/sound.h" -#include "sound/audiostream.h" -#include "sound/decoders/flac.h" -#include "sound/mixer.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" +#include "audio/audiostream.h" +#include "audio/decoders/flac.h" +#include "audio/mixer.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/voc.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/wave.h" namespace AGOS { diff --git a/engines/agos/sound.h b/engines/agos/sound.h index 10ff14d5ac..9739cfb58f 100644 --- a/engines/agos/sound.h +++ b/engines/agos/sound.h @@ -26,8 +26,8 @@ #ifndef AGOS_SOUND_H #define AGOS_SOUND_H -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" #include "agos/intern.h" #include "common/str.h" diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index 23e9db9670..f0c0668e33 100644 --- a/engines/cine/sound.cpp +++ b/engines/cine/sound.cpp @@ -30,10 +30,10 @@ #include "cine/cine.h" #include "cine/sound.h" -#include "sound/audiostream.h" -#include "sound/fmopl.h" -#include "sound/decoders/raw.h" -#include "sound/mods/soundfx.h" +#include "audio/audiostream.h" +#include "audio/fmopl.h" +#include "audio/decoders/raw.h" +#include "audio/mods/soundfx.h" namespace Cine { diff --git a/engines/cine/sound.h b/engines/cine/sound.h index 6982468035..e9a797989e 100644 --- a/engines/cine/sound.h +++ b/engines/cine/sound.h @@ -27,7 +27,7 @@ #define CINE_SOUND_H_ #include "common/util.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Audio { class AudioStream; diff --git a/engines/cruise/sound.cpp b/engines/cruise/sound.cpp index 3cb499c6a4..8a4b1d0d2b 100644 --- a/engines/cruise/sound.cpp +++ b/engines/cruise/sound.cpp @@ -30,9 +30,9 @@ #include "cruise/sound.h" #include "cruise/volume.h" -#include "sound/audiostream.h" -#include "sound/fmopl.h" -#include "sound/mods/soundfx.h" +#include "audio/audiostream.h" +#include "audio/fmopl.h" +#include "audio/mods/soundfx.h" namespace Cruise { diff --git a/engines/cruise/sound.h b/engines/cruise/sound.h index fdea5bed1b..61985ce802 100644 --- a/engines/cruise/sound.h +++ b/engines/cruise/sound.h @@ -26,9 +26,9 @@ #ifndef CRUISE_SOUND_H #define CRUISE_SOUND_H -#include "sound/mididrv.h" -#include "sound/midiparser.h" -#include "sound/mixer.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" +#include "audio/mixer.h" #include "common/config-manager.h" #include "common/serializer.h" diff --git a/engines/draci/music.cpp b/engines/draci/music.cpp index 95b7ae08da..caa82c2cc0 100644 --- a/engines/draci/music.cpp +++ b/engines/draci/music.cpp @@ -25,9 +25,9 @@ // MIDI and digital music class -#include "sound/audiostream.h" -#include "sound/mididrv.h" -#include "sound/midiparser.h" +#include "audio/audiostream.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "common/config-manager.h" #include "common/file.h" diff --git a/engines/draci/music.h b/engines/draci/music.h index 2d3da47e46..f6f3a5ae50 100644 --- a/engines/draci/music.h +++ b/engines/draci/music.h @@ -28,8 +28,8 @@ #ifndef DRACI_MUSIC_H #define DRACI_MUSIC_H -#include "sound/mididrv.h" -#include "sound/midiparser.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "common/mutex.h" namespace Draci { diff --git a/engines/draci/sound.cpp b/engines/draci/sound.cpp index af096256ea..dc8f548d6b 100644 --- a/engines/draci/sound.cpp +++ b/engines/draci/sound.cpp @@ -36,12 +36,12 @@ #include "draci/draci.h" #include "draci/game.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/vorbis.h" -#include "sound/decoders/flac.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/flac.h" namespace Draci { diff --git a/engines/draci/sound.h b/engines/draci/sound.h index 6e9aae1b6e..4f69af7ff0 100644 --- a/engines/draci/sound.h +++ b/engines/draci/sound.h @@ -29,7 +29,7 @@ #include "common/str.h" #include "common/file.h" #include "common/list.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Common { class Archive; diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index b931eb191c..e84e80ccd3 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -37,7 +37,7 @@ #include "engines/util.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "drascula/drascula.h" #include "drascula/console.h" diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index 4608624614..ac3f86b9ba 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -38,7 +38,7 @@ #include "common/system.h" #include "common/util.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "engines/engine.h" diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp index 094f9ba817..48e7492b11 100644 --- a/engines/drascula/sound.cpp +++ b/engines/drascula/sound.cpp @@ -23,10 +23,10 @@ * */ -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" -#include "sound/decoders/voc.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/voc.h" #include "common/config-manager.h" diff --git a/engines/engine.cpp b/engines/engine.cpp index b8ddc631df..0d92c1aef1 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -48,7 +48,7 @@ #include "gui/message.h" #include "gui/gui-manager.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "graphics/cursorman.h" diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 4d36933fef..b65bbe0d0f 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -32,7 +32,7 @@ #include "base/plugins.h" #include "common/config-manager.h" #include "common/md5.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" #include "gui/gui-manager.h" #include "gui/dialog.h" diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index bb27dd0888..63b2d7f681 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -28,8 +28,8 @@ #include "gui/message.h" -#include "sound/mixer.h" -#include "sound/mods/infogrames.h" +#include "audio/mixer.h" +#include "audio/mods/infogrames.h" #include "gob/gob.h" #include "gob/inter.h" diff --git a/engines/gob/sound/adlib.h b/engines/gob/sound/adlib.h index 3f7b46643f..090841b9d6 100644 --- a/engines/gob/sound/adlib.h +++ b/engines/gob/sound/adlib.h @@ -27,9 +27,9 @@ #define GOB_SOUND_ADLIB_H #include "common/mutex.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/fmopl.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/fmopl.h" namespace Gob { diff --git a/engines/gob/sound/bgatmosphere.h b/engines/gob/sound/bgatmosphere.h index aabf6a7e9e..71a2263341 100644 --- a/engines/gob/sound/bgatmosphere.h +++ b/engines/gob/sound/bgatmosphere.h @@ -26,7 +26,7 @@ #ifndef GOB_SOUND_BGATMOSPHERE_H #define GOB_SOUND_BGATMOSPHERE_H -#include "sound/mixer.h" +#include "audio/mixer.h" #include "common/mutex.h" #include "common/random.h" diff --git a/engines/gob/sound/infogrames.h b/engines/gob/sound/infogrames.h index 4a20dceb22..cdcb0a7c39 100644 --- a/engines/gob/sound/infogrames.h +++ b/engines/gob/sound/infogrames.h @@ -26,8 +26,8 @@ #ifndef GOB_SOUND_INFOGRAMES_H #define GOB_SOUND_INFOGRAMES_H -#include "sound/mixer.h" -#include "sound/mods/infogrames.h" +#include "audio/mixer.h" +#include "audio/mods/infogrames.h" namespace Gob { diff --git a/engines/gob/sound/pcspeaker.h b/engines/gob/sound/pcspeaker.h index 8c4fb08021..f83d65a615 100644 --- a/engines/gob/sound/pcspeaker.h +++ b/engines/gob/sound/pcspeaker.h @@ -26,8 +26,8 @@ #ifndef GOB_SOUND_PCSPEAKER_H #define GOB_SOUND_PCSPEAKER_H -#include "sound/mixer.h" -#include "sound/softsynth/pcspk.h" +#include "audio/mixer.h" +#include "audio/softsynth/pcspk.h" namespace Gob { diff --git a/engines/gob/sound/protracker.cpp b/engines/gob/sound/protracker.cpp index 9c7de72c29..445d8f8cfb 100644 --- a/engines/gob/sound/protracker.cpp +++ b/engines/gob/sound/protracker.cpp @@ -25,7 +25,7 @@ #include "common/file.h" -#include "sound/mods/protracker.h" +#include "audio/mods/protracker.h" #include "gob/sound/protracker.h" diff --git a/engines/gob/sound/protracker.h b/engines/gob/sound/protracker.h index 73cae0d510..0397efb3b7 100644 --- a/engines/gob/sound/protracker.h +++ b/engines/gob/sound/protracker.h @@ -26,8 +26,8 @@ #ifndef GOB_SOUND_PROTRACKER_H #define GOB_SOUND_PROTRACKER_H -#include "sound/mixer.h" -#include "sound/audiostream.h" +#include "audio/mixer.h" +#include "audio/audiostream.h" namespace Gob { diff --git a/engines/gob/sound/soundblaster.h b/engines/gob/sound/soundblaster.h index a2dc87267c..ffe46801dc 100644 --- a/engines/gob/sound/soundblaster.h +++ b/engines/gob/sound/soundblaster.h @@ -27,7 +27,7 @@ #define GOB_SOUND_SOUNDBLASTER_H #include "common/mutex.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "gob/sound/soundmixer.h" diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp index 8903597bb0..d33ea89147 100644 --- a/engines/gob/sound/sounddesc.cpp +++ b/engines/gob/sound/sounddesc.cpp @@ -25,9 +25,9 @@ #include "common/util.h" #include "common/memstream.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" -#include "sound/decoders/wave.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" +#include "audio/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 1f5cf2e053..b6082c577c 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/decoders/raw.h" +#include "audio/decoders/raw.h" namespace Gob { diff --git a/engines/gob/sound/soundmixer.h b/engines/gob/sound/soundmixer.h index 9e66c474e9..5b283b2d84 100644 --- a/engines/gob/sound/soundmixer.h +++ b/engines/gob/sound/soundmixer.h @@ -28,8 +28,8 @@ #include "common/mutex.h" #include "common/frac.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" namespace Gob { diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index f280da8f56..4a4f5e0de5 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -40,7 +40,7 @@ #include "backends/audiocd/audiocd.h" #include "engines/util.h" #include "graphics/fontman.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Groovie { diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index fd2cc2bec8..011409155c 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -31,7 +31,7 @@ #include "common/config-manager.h" #include "common/macresman.h" #include "common/memstream.h" -#include "sound/midiparser.h" +#include "audio/midiparser.h" namespace Groovie { diff --git a/engines/groovie/music.h b/engines/groovie/music.h index 5b5f5bd346..74bb6f98e5 100644 --- a/engines/groovie/music.h +++ b/engines/groovie/music.h @@ -28,7 +28,7 @@ #include "common/array.h" #include "common/mutex.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" class MidiParser; diff --git a/engines/groovie/player.h b/engines/groovie/player.h index bb156d7929..c9f47b8100 100644 --- a/engines/groovie/player.h +++ b/engines/groovie/player.h @@ -27,7 +27,7 @@ #define GROOVIE_PLAYER_H #include "common/system.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" namespace Groovie { diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 6772a5a40f..540465050d 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -36,8 +36,8 @@ // Required for the YUV to RGB conversion #include "graphics/conversion.h" #endif -#include "sound/mixer.h" -#include "sound/decoders/raw.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" namespace Groovie { diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp index 3ab8608031..10177dad34 100644 --- a/engines/groovie/vdx.cpp +++ b/engines/groovie/vdx.cpp @@ -29,8 +29,8 @@ #include "groovie/lzss.h" #include "common/debug-channels.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" +#include "audio/mixer.h" +#include "audio/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/hugo/sound.cpp b/engines/hugo/sound.cpp index b382f449b0..ecf1bd1a86 100644 --- a/engines/hugo/sound.cpp +++ b/engines/hugo/sound.cpp @@ -35,8 +35,8 @@ #include "common/system.h" #include "common/config-manager.h" -#include "sound/decoders/raw.h" -#include "sound/audiostream.h" +#include "audio/decoders/raw.h" +#include "audio/audiostream.h" #include "hugo/hugo.h" #include "hugo/game.h" diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h index 0e8905c762..e39f932741 100644 --- a/engines/hugo/sound.h +++ b/engines/hugo/sound.h @@ -33,10 +33,10 @@ #ifndef HUGO_SOUND_H #define HUGO_SOUND_H -#include "sound/mixer.h" -#include "sound/mididrv.h" -#include "sound/midiparser.h" -#include "sound/softsynth/pcspk.h" +#include "audio/mixer.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" +#include "audio/softsynth/pcspk.h" namespace Hugo { diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 26c4001578..f5b96410e8 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -27,8 +27,8 @@ #include "common/debug-channels.h" #include "common/EventRecorder.h" -#include "sound/mididrv.h" -#include "sound/mixer.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" #include "kyra/kyra_v1.h" #include "kyra/sound_intern.h" diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 31c07336a6..12b9fb5942 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -34,7 +34,7 @@ #include "common/hashmap.h" #include "common/system.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "kyra/script.h" #include "kyra/item.h" diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 87bd67b40b..36bc0c99d7 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -34,8 +34,8 @@ #include "kyra/util.h" #include "kyra/debugger.h" -#include "sound/decoders/voc.h" -#include "sound/audiostream.h" +#include "audio/decoders/voc.h" +#include "audio/audiostream.h" #include "common/config-manager.h" #include "common/endian.h" diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index a1d88a3005..9dd046e50b 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -30,14 +30,14 @@ #include "kyra/resource.h" #include "kyra/sound.h" -#include "sound/mixer.h" -#include "sound/decoders/voc.h" -#include "sound/audiostream.h" - -#include "sound/decoders/flac.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/raw.h" -#include "sound/decoders/vorbis.h" +#include "audio/mixer.h" +#include "audio/decoders/voc.h" +#include "audio/audiostream.h" + +#include "audio/decoders/flac.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/vorbis.h" namespace Kyra { diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index 8b83796d46..326fef94d1 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -31,7 +31,7 @@ #include "common/scummsys.h" #include "common/str.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Audio { class AudioStream; diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index a45972ece7..758d66192d 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -45,9 +45,9 @@ #include "kyra/resource.h" #include "kyra/sound_intern.h" -#include "sound/mixer.h" -#include "sound/fmopl.h" -#include "sound/audiostream.h" +#include "audio/mixer.h" +#include "audio/fmopl.h" +#include "audio/audiostream.h" // Basic AdLib Programming: // http://www.gamedev.net/reference/articles/article446.asp diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index 5ded3e31e7..c5e9f6171d 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -28,9 +28,9 @@ #include "kyra/resource.h" #include "kyra/sound_intern.h" -#include "sound/mixer.h" -#include "sound/mods/maxtrax.h" -#include "sound/audiostream.h" +#include "audio/mixer.h" +#include "audio/mods/maxtrax.h" +#include "audio/audiostream.h" namespace Kyra { diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp index 150bafbef3..3d318b7e24 100644 --- a/engines/kyra/sound_digital.cpp +++ b/engines/kyra/sound_digital.cpp @@ -27,11 +27,11 @@ #include "kyra/resource.h" #include "kyra/kyra_mr.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/vorbis.h" -#include "sound/decoders/flac.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/flac.h" namespace Kyra { diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h index bc1c2be1e2..7b33fc218c 100644 --- a/engines/kyra/sound_intern.h +++ b/engines/kyra/sound_intern.h @@ -31,11 +31,11 @@ #include "common/mutex.h" -#include "sound/softsynth/fmtowns_pc98/towns_pc98_driver.h" -#include "sound/softsynth/fmtowns_pc98/towns_euphony.h" +#include "audio/softsynth/fmtowns_pc98/towns_pc98_driver.h" +#include "audio/softsynth/fmtowns_pc98/towns_euphony.h" -#include "sound/softsynth/emumidi.h" -#include "sound/midiparser.h" +#include "audio/softsynth/emumidi.h" +#include "audio/midiparser.h" namespace Audio { class PCSpeaker; diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index c233987120..87679f5bfb 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -29,7 +29,7 @@ #include "kyra/lol.h" #include "kyra/resource.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" namespace Kyra { diff --git a/engines/kyra/sound_pcspk.cpp b/engines/kyra/sound_pcspk.cpp index 0f3cce1c55..46f35af3ab 100644 --- a/engines/kyra/sound_pcspk.cpp +++ b/engines/kyra/sound_pcspk.cpp @@ -25,8 +25,8 @@ #include "kyra/sound_intern.h" -#include "sound/mixer.h" -#include "sound/softsynth/pcspk.h" +#include "audio/mixer.h" +#include "audio/softsynth/pcspk.h" namespace Kyra { diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 1bd5af07de..416ad520bb 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -32,8 +32,8 @@ #include "backends/audiocd/audiocd.h" -#include "sound/audiostream.h" -#include "sound/decoders/raw.h" +#include "audio/audiostream.h" +#include "audio/decoders/raw.h" #include "common/util.h" diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index 674a5755cf..382ec2429d 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -35,9 +35,9 @@ #include "kyra/vqa.h" #include "common/system.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" #include "kyra/sound.h" #include "kyra/screen.h" diff --git a/engines/kyra/vqa.h b/engines/kyra/vqa.h index 129d526e98..b618b2f044 100644 --- a/engines/kyra/vqa.h +++ b/engines/kyra/vqa.h @@ -28,7 +28,7 @@ #include "common/scummsys.h" -#include "sound/mixer.h" +#include "audio/mixer.h" class OSystem; diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp index b98e490215..bd2320726a 100644 --- a/engines/lastexpress/data/snd.cpp +++ b/engines/lastexpress/data/snd.cpp @@ -30,8 +30,8 @@ #include "lastexpress/debug.h" -#include "sound/decoders/adpcm.h" -#include "sound/audiostream.h" +#include "audio/decoders/adpcm.h" +#include "audio/audiostream.h" #include "common/memstream.h" namespace LastExpress { diff --git a/engines/lastexpress/data/snd.h b/engines/lastexpress/data/snd.h index f76f8ff6ca..2d28404f42 100644 --- a/engines/lastexpress/data/snd.h +++ b/engines/lastexpress/data/snd.h @@ -39,7 +39,7 @@ byte {x} - IMA ADPCM sample codes */ -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Audio { class AudioStream; diff --git a/engines/lure/lure.h b/engines/lure/lure.h index 297fb20f59..99e9e3d93e 100644 --- a/engines/lure/lure.h +++ b/engines/lure/lure.h @@ -28,7 +28,7 @@ #include "engines/engine.h" #include "common/rect.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "common/file.h" #include "common/savefile.h" #include "common/util.h" diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp index 85beba8447..5f954eb337 100644 --- a/engines/lure/sound.cpp +++ b/engines/lure/sound.cpp @@ -32,7 +32,7 @@ #include "common/algorithm.h" #include "common/config-manager.h" #include "common/endian.h" -#include "sound/midiparser.h" +#include "audio/midiparser.h" DECLARE_SINGLETON(Lure::SoundManager); diff --git a/engines/lure/sound.h b/engines/lure/sound.h index 6d248fbd20..f50748ab0a 100644 --- a/engines/lure/sound.h +++ b/engines/lure/sound.h @@ -32,8 +32,8 @@ #include "common/singleton.h" #include "common/ptr.h" -#include "sound/mididrv.h" -#include "sound/mixer.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" class MidiParser; diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp index 73dba87e99..d557ef991b 100644 --- a/engines/m4/m4.cpp +++ b/engines/m4/m4.cpp @@ -61,7 +61,7 @@ #include "common/debug-channels.h" #include "engines/util.h" #include "graphics/surface.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" namespace M4 { diff --git a/engines/m4/m4.h b/engines/m4/m4.h index 8069c960f1..f665df262b 100644 --- a/engines/m4/m4.h +++ b/engines/m4/m4.h @@ -29,7 +29,7 @@ #include "common/scummsys.h" #include "common/util.h" #include "common/random.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" #include "engines/engine.h" diff --git a/engines/m4/midi.h b/engines/m4/midi.h index 45cf23b58d..8344f8d485 100644 --- a/engines/m4/midi.h +++ b/engines/m4/midi.h @@ -28,8 +28,8 @@ #ifndef M4_MIDI_H #define M4_MIDI_H -#include "sound/mididrv.h" -#include "sound/midiparser.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "common/mutex.h" namespace M4 { diff --git a/engines/m4/sound.cpp b/engines/m4/sound.cpp index 76f0cded46..14c60c1c58 100644 --- a/engines/m4/sound.cpp +++ b/engines/m4/sound.cpp @@ -29,9 +29,9 @@ #include "common/stream.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" namespace M4 { diff --git a/engines/m4/sound.h b/engines/m4/sound.h index 5587810506..8962e67dfd 100644 --- a/engines/m4/sound.h +++ b/engines/m4/sound.h @@ -30,10 +30,10 @@ #include "common/file.h" #include "common/array.h" -#include "sound/mixer.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/vorbis.h" -#include "sound/decoders/flac.h" +#include "audio/mixer.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/flac.h" namespace M4 { diff --git a/engines/made/made.cpp b/engines/made/made.cpp index ba22074bec..11f7734495 100644 --- a/engines/made/made.cpp +++ b/engines/made/made.cpp @@ -40,7 +40,7 @@ #include "base/plugins.h" #include "base/version.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "made/made.h" #include "made/database.h" diff --git a/engines/made/made.h b/engines/made/made.h index 302c8f5275..780f59e442 100644 --- a/engines/made/made.h +++ b/engines/made/made.h @@ -39,9 +39,9 @@ #include "graphics/surface.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/decoders/voc.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/decoders/voc.h" #include "engines/engine.h" diff --git a/engines/made/music.cpp b/engines/made/music.cpp index 3124fc069e..8c9248a262 100644 --- a/engines/made/music.cpp +++ b/engines/made/music.cpp @@ -27,9 +27,9 @@ // MIDI and digital music class -#include "sound/audiostream.h" -#include "sound/mididrv.h" -#include "sound/midiparser.h" +#include "audio/audiostream.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "common/config-manager.h" #include "common/file.h" diff --git a/engines/made/music.h b/engines/made/music.h index 116ea7d5fd..9840c50cfa 100644 --- a/engines/made/music.h +++ b/engines/made/music.h @@ -28,8 +28,8 @@ #ifndef MADE_MUSIC_H #define MADE_MUSIC_H -#include "sound/mididrv.h" -#include "sound/midiparser.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "common/mutex.h" #include "made/resource.h" diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp index a21d767998..34163a940d 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/decoders/raw.h" +#include "audio/decoders/raw.h" namespace Made { diff --git a/engines/made/pmvplayer.h b/engines/made/pmvplayer.h index 3a5295711d..8014a5a0f1 100644 --- a/engines/made/pmvplayer.h +++ b/engines/made/pmvplayer.h @@ -31,8 +31,8 @@ #include "common/file.h" #include "common/endian.h" #include "graphics/surface.h" -#include "sound/mixer.h" -#include "sound/audiostream.h" +#include "audio/mixer.h" +#include "audio/audiostream.h" #include "made/graphics.h" #include "made/sound.h" diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp index 6140e7e0de..f8582aec40 100644 --- a/engines/made/resource.cpp +++ b/engines/made/resource.cpp @@ -25,8 +25,8 @@ #include "common/endian.h" #include "common/memstream.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" #include "made/resource.h" #include "made/graphics.h" diff --git a/engines/made/resource.h b/engines/made/resource.h index ca71dc86f7..5d5664b4c7 100644 --- a/engines/made/resource.h +++ b/engines/made/resource.h @@ -31,7 +31,7 @@ #include "common/stream.h" #include "common/hashmap.h" #include "graphics/surface.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" #include "made/sound.h" diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp index 1a17beb19b..4f1937c057 100644 --- a/engines/made/scriptfuncs.cpp +++ b/engines/made/scriptfuncs.cpp @@ -29,7 +29,7 @@ #include "backends/audiocd/audiocd.h" #include "graphics/cursorman.h" -#include "sound/softsynth/pcspk.h" +#include "audio/softsynth/pcspk.h" #include "made/made.h" #include "made/resource.h" diff --git a/engines/mohawk/cstime.h b/engines/mohawk/cstime.h index 3b5be08c2c..40293916db 100644 --- a/engines/mohawk/cstime.h +++ b/engines/mohawk/cstime.h @@ -33,7 +33,7 @@ #include "common/random.h" #include "common/list.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Mohawk { diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h index 7b072e61de..68b9ac6461 100644 --- a/engines/mohawk/livingbooks.h +++ b/engines/mohawk/livingbooks.h @@ -36,7 +36,7 @@ #include "common/queue.h" #include "common/random.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "livingbooks_code.h" diff --git a/engines/mohawk/mohawk.cpp b/engines/mohawk/mohawk.cpp index fbe52da998..a3db630c6a 100644 --- a/engines/mohawk/mohawk.cpp +++ b/engines/mohawk/mohawk.cpp @@ -38,7 +38,7 @@ #include "mohawk/sound.h" #include "mohawk/video.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Mohawk { diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index 1583baf2b0..e5528e64f4 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -27,11 +27,11 @@ #include "common/util.h" -#include "sound/musicplugin.h" -#include "sound/audiostream.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/raw.h" -#include "sound/decoders/wave.h" +#include "audio/musicplugin.h" +#include "audio/audiostream.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/wave.h" namespace Mohawk { diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h index 33fd167d9f..938f15fcb2 100644 --- a/engines/mohawk/sound.h +++ b/engines/mohawk/sound.h @@ -29,11 +29,11 @@ #include "common/scummsys.h" #include "common/str.h" -#include "sound/audiostream.h" -#include "sound/decoders/adpcm.h" -#include "sound/mididrv.h" -#include "sound/midiparser.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/decoders/adpcm.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" +#include "audio/mixer.h" #include "mohawk/mohawk.h" #include "mohawk/resource.h" diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h index 1efbb17395..7b3eff37cb 100644 --- a/engines/parallaction/sound.h +++ b/engines/parallaction/sound.h @@ -29,10 +29,10 @@ #include "common/util.h" #include "common/mutex.h" -#include "sound/audiostream.h" -#include "sound/decoders/iff_sound.h" -#include "sound/mixer.h" -#include "sound/mididrv.h" +#include "audio/audiostream.h" +#include "audio/decoders/iff_sound.h" +#include "audio/mixer.h" +#include "audio/mididrv.h" #define PATH_LEN 200 diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp index 7aaafa8be3..978d809a61 100644 --- a/engines/parallaction/sound_br.cpp +++ b/engines/parallaction/sound_br.cpp @@ -23,15 +23,15 @@ * */ -#include "sound/mixer.h" +#include "audio/mixer.h" #include "common/stream.h" #include "common/util.h" -#include "sound/mixer.h" -#include "sound/mididrv.h" -#include "sound/midiparser.h" -#include "sound/mods/protracker.h" -#include "sound/decoders/raw.h" +#include "audio/mixer.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" +#include "audio/mods/protracker.h" +#include "audio/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 1ed45befa9..15fdede571 100644 --- a/engines/parallaction/sound_ns.cpp +++ b/engines/parallaction/sound_ns.cpp @@ -27,10 +27,10 @@ #include "common/stream.h" -#include "sound/mixer.h" -#include "sound/midiparser.h" -#include "sound/mods/protracker.h" -#include "sound/decoders/raw.h" +#include "audio/mixer.h" +#include "audio/midiparser.h" +#include "audio/mods/protracker.h" +#include "audio/decoders/raw.h" #include "parallaction/sound.h" #include "parallaction/parallaction.h" diff --git a/engines/queen/midiadlib.cpp b/engines/queen/midiadlib.cpp index 904952b1c5..c3bc6d1c17 100644 --- a/engines/queen/midiadlib.cpp +++ b/engines/queen/midiadlib.cpp @@ -25,8 +25,8 @@ #include "common/endian.h" -#include "sound/fmopl.h" -#include "sound/softsynth/emumidi.h" +#include "audio/fmopl.h" +#include "audio/softsynth/emumidi.h" namespace Queen { diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp index be6b0dc773..4dc698dac9 100644 --- a/engines/queen/music.cpp +++ b/engines/queen/music.cpp @@ -32,7 +32,7 @@ #include "queen/resource.h" #include "queen/sound.h" -#include "sound/midiparser.h" +#include "audio/midiparser.h" namespace Queen { diff --git a/engines/queen/music.h b/engines/queen/music.h index 16c2012973..fe45d56fde 100644 --- a/engines/queen/music.h +++ b/engines/queen/music.h @@ -29,7 +29,7 @@ #include "common/util.h" #include "common/mutex.h" #include "common/random.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" class MidiParser; diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index 503e46fc48..6eb7362338 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -35,12 +35,12 @@ #include "queen/queen.h" #include "queen/resource.h" -#include "sound/audiostream.h" -#include "sound/decoders/flac.h" -#include "sound/mididrv.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/raw.h" -#include "sound/decoders/vorbis.h" +#include "audio/audiostream.h" +#include "audio/decoders/flac.h" +#include "audio/mididrv.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/vorbis.h" #define SB_HEADER_SIZE_V104 110 #define SB_HEADER_SIZE_V110 122 diff --git a/engines/queen/sound.h b/engines/queen/sound.h index 331034f746..cee0463ed1 100644 --- a/engines/queen/sound.h +++ b/engines/queen/sound.h @@ -27,8 +27,8 @@ #define QUEEN_SOUND_H #include "common/util.h" -#include "sound/mixer.h" -#include "sound/mods/rjp1.h" +#include "audio/mixer.h" +#include "audio/mods/rjp1.h" #include "queen/defs.h" namespace Common { diff --git a/engines/saga/introproc_saga2.cpp b/engines/saga/introproc_saga2.cpp index 2752ddd933..5ae80b14c9 100644 --- a/engines/saga/introproc_saga2.cpp +++ b/engines/saga/introproc_saga2.cpp @@ -31,7 +31,7 @@ #include "saga/scene.h" #include "saga/gfx.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "graphics/surface.h" #include "video/smk_decoder.h" diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index 3c0ce75db0..dd3034cdb9 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -30,10 +30,10 @@ #include "saga/resource.h" #include "saga/music.h" -#include "sound/audiostream.h" -#include "sound/mididrv.h" -#include "sound/midiparser.h" -#include "sound/decoders/raw.h" +#include "audio/audiostream.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" +#include "audio/decoders/raw.h" #include "common/config-manager.h" #include "common/file.h" #include "common/substream.h" diff --git a/engines/saga/music.h b/engines/saga/music.h index c7fef7225b..7d599d91c2 100644 --- a/engines/saga/music.h +++ b/engines/saga/music.h @@ -28,12 +28,12 @@ #ifndef SAGA_MUSIC_H #define SAGA_MUSIC_H -#include "sound/mididrv.h" -#include "sound/midiparser.h" -#include "sound/mixer.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/vorbis.h" -#include "sound/decoders/flac.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" +#include "audio/mixer.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/flac.h" #include "common/mutex.h" namespace Saga { diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index abd681ce87..2e34b49dc5 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -30,7 +30,7 @@ #include "common/events.h" #include "common/EventRecorder.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "saga/saga.h" diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 149f1cb580..52c4b824e7 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -31,7 +31,7 @@ #include "common/array.h" #include "common/random.h" #include "common/memstream.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" #include "saga/gfx.h" diff --git a/engines/saga/shorten.cpp b/engines/saga/shorten.cpp index a87e427f9a..685cb26aa7 100644 --- a/engines/saga/shorten.cpp +++ b/engines/saga/shorten.cpp @@ -37,8 +37,8 @@ #include "common/endian.h" #include "common/util.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" namespace Saga { diff --git a/engines/saga/shorten.h b/engines/saga/shorten.h index 368d2ac985..f320e1dcc5 100644 --- a/engines/saga/shorten.h +++ b/engines/saga/shorten.h @@ -35,7 +35,7 @@ #include "common/scummsys.h" #include "common/stream.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" namespace Saga { diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp index 74fde3e497..46b13727a0 100644 --- a/engines/saga/sndres.cpp +++ b/engines/saga/sndres.cpp @@ -34,12 +34,12 @@ #include "common/file.h" -#include "sound/audiostream.h" -#include "sound/decoders/adpcm.h" -#include "sound/decoders/aiff.h" -#include "sound/decoders/raw.h" -#include "sound/decoders/voc.h" -#include "sound/decoders/wave.h" +#include "audio/audiostream.h" +#include "audio/decoders/adpcm.h" +#include "audio/decoders/aiff.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/voc.h" +#include "audio/decoders/wave.h" #ifdef ENABLE_SAGA2 #include "saga/shorten.h" #endif diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp index b3fcf4def3..07e8487ee4 100644 --- a/engines/saga/sound.cpp +++ b/engines/saga/sound.cpp @@ -28,10 +28,10 @@ #include "saga/saga.h" #include "saga/sound.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/decoders/adpcm.h" -#include "sound/decoders/raw.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/decoders/adpcm.h" +#include "audio/decoders/raw.h" namespace Saga { diff --git a/engines/saga/sound.h b/engines/saga/sound.h index b5f82369f4..15003b515c 100644 --- a/engines/saga/sound.h +++ b/engines/saga/sound.h @@ -29,10 +29,10 @@ #define SAGA_SOUND_H #include "common/file.h" -#include "sound/mixer.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/vorbis.h" -#include "sound/decoders/flac.h" +#include "audio/mixer.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/flac.h" namespace Saga { diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index f6ec60acb6..e006e22482 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -31,7 +31,7 @@ #include "sci/sound/audio.h" #include "sci/sound/soundcmd.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Sci { diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index b376ba947c..73f471b247 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -35,14 +35,14 @@ #include "common/memstream.h" #include "common/system.h" -#include "sound/audiostream.h" -#include "sound/decoders/aiff.h" -#include "sound/decoders/flac.h" -#include "sound/decoders/mac_snd.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/raw.h" -#include "sound/decoders/vorbis.h" -#include "sound/decoders/wave.h" +#include "audio/audiostream.h" +#include "audio/decoders/aiff.h" +#include "audio/decoders/flac.h" +#include "audio/decoders/mac_snd.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/wave.h" namespace Sci { diff --git a/engines/sci/sound/audio.h b/engines/sci/sound/audio.h index 92d7b946f5..4cc8575a21 100644 --- a/engines/sci/sound/audio.h +++ b/engines/sci/sound/audio.h @@ -28,7 +28,7 @@ #define SCI_AUDIO_H #include "sci/engine/vm_types.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Audio { class RewindableAudioStream; diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp index 20bac4a2c0..057b7c177f 100644 --- a/engines/sci/sound/drivers/adlib.cpp +++ b/engines/sci/sound/drivers/adlib.cpp @@ -27,8 +27,8 @@ #include "common/file.h" -#include "sound/fmopl.h" -#include "sound/softsynth/emumidi.h" +#include "audio/fmopl.h" +#include "audio/softsynth/emumidi.h" #include "sci/resource.h" #include "sci/sound/drivers/mididriver.h" diff --git a/engines/sci/sound/drivers/amigamac.cpp b/engines/sci/sound/drivers/amigamac.cpp index 7cf798a27e..0ec4c283f7 100644 --- a/engines/sci/sound/drivers/amigamac.cpp +++ b/engines/sci/sound/drivers/amigamac.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/softsynth/emumidi.h" +#include "audio/softsynth/emumidi.h" #include "sci/sound/drivers/mididriver.h" #include "sci/resource.h" diff --git a/engines/sci/sound/drivers/cms.cpp b/engines/sci/sound/drivers/cms.cpp index cd7b101f03..ff38e1c554 100644 --- a/engines/sci/sound/drivers/cms.cpp +++ b/engines/sci/sound/drivers/cms.cpp @@ -25,9 +25,9 @@ #include "sci/sound/drivers/mididriver.h" -#include "sound/softsynth/emumidi.h" -#include "sound/softsynth/cms.h" -#include "sound/mixer.h" +#include "audio/softsynth/emumidi.h" +#include "audio/softsynth/cms.h" +#include "audio/mixer.h" #include "sci/resource.h" diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp index c274c8bce2..b9a973ad7d 100644 --- a/engines/sci/sound/drivers/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -29,8 +29,8 @@ #include "common/file.h" #include "common/memstream.h" -#include "sound/fmopl.h" -#include "sound/softsynth/emumidi.h" +#include "audio/fmopl.h" +#include "audio/softsynth/emumidi.h" #include "sci/resource.h" #include "sci/engine/features.h" diff --git a/engines/sci/sound/drivers/mididriver.h b/engines/sci/sound/drivers/mididriver.h index dabe869a8f..f745d62716 100644 --- a/engines/sci/sound/drivers/mididriver.h +++ b/engines/sci/sound/drivers/mididriver.h @@ -27,7 +27,7 @@ #define SCI_SFX_SOFTSEQ_MIDIDRIVER_H #include "sci/sci.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" #include "common/error.h" namespace Sci { diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp index e1c3302fef..063332577e 100644 --- a/engines/sci/sound/drivers/pcjr.cpp +++ b/engines/sci/sound/drivers/pcjr.cpp @@ -25,7 +25,7 @@ #include "sci/sound/drivers/mididriver.h" -#include "sound/softsynth/emumidi.h" +#include "audio/softsynth/emumidi.h" namespace Sci { diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h index fa24a209e4..39de425e18 100644 --- a/engines/sci/sound/midiparser_sci.h +++ b/engines/sci/sound/midiparser_sci.h @@ -28,7 +28,7 @@ #include "sci/resource.h" #include "sci/sound/music.h" -#include "sound/midiparser.h" +#include "audio/midiparser.h" /* Sound drivers info: (from driver cmd0) diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index d9be4ed0fe..f0963e7d64 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -23,8 +23,8 @@ * */ -#include "sound/audiostream.h" -#include "sound/decoders/raw.h" +#include "audio/audiostream.h" +#include "audio/decoders/raw.h" #include "common/config-manager.h" #include "sci/sci.h" diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h index f735fcd6c5..dfe5ad1586 100644 --- a/engines/sci/sound/music.h +++ b/engines/sci/sound/music.h @@ -29,8 +29,8 @@ #include "common/serializer.h" #include "common/mutex.h" -#include "sound/mixer.h" -#include "sound/audiostream.h" +#include "audio/mixer.h" +#include "audio/audiostream.h" #include "sci/sci.h" #include "sci/resource.h" diff --git a/engines/sci/sound/soundcmd.h b/engines/sci/sound/soundcmd.h index 45b93e9a09..cae72e2cdb 100644 --- a/engines/sci/sound/soundcmd.h +++ b/engines/sci/sound/soundcmd.h @@ -27,7 +27,7 @@ #define SCI_SOUNDCMD_H #include "common/list.h" -#include "sound/mididrv.h" // for MusicType +#include "audio/mididrv.h" // for MusicType #include "sci/engine/state.h" namespace Sci { diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp index 8dd60cd9a6..bf52de67d5 100644 --- a/engines/sci/video/robot_decoder.cpp +++ b/engines/sci/video/robot_decoder.cpp @@ -31,7 +31,7 @@ #include "common/util.h" #include "graphics/surface.h" -#include "sound/decoders/raw.h" +#include "audio/decoders/raw.h" #include "sci/resource.h" #include "sci/util.h" diff --git a/engines/sci/video/robot_decoder.h b/engines/sci/video/robot_decoder.h index b8ca0ee857..52bf0bad07 100644 --- a/engines/sci/video/robot_decoder.h +++ b/engines/sci/video/robot_decoder.h @@ -30,8 +30,8 @@ #include "common/rect.h" #include "common/stream.h" #include "common/substream.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" #include "video/video_decoder.h" namespace Sci { diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index 729e66b310..e396d37e30 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -46,8 +46,8 @@ #include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/verbs.h" -#include "sound/mididrv.h" -#include "sound/mixer.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" #ifndef DISABLE_HELP #include "scumm/help.h" diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 80cfcfcd0b..7840b9df20 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -28,7 +28,7 @@ #include "scumm/he/animation_he.h" #include "scumm/he/intern_he.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" namespace Scumm { diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h index 7914d09f40..f5000bca59 100644 --- a/engines/scumm/he/animation_he.h +++ b/engines/scumm/he/animation_he.h @@ -28,7 +28,7 @@ #include "video/smk_decoder.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Scumm { diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index 2045b8084c..516ff6b977 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -27,9 +27,9 @@ #include "common/system.h" #include "common/memstream.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/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 135af1bb38..72e7052034 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -34,7 +34,7 @@ #include "scumm/he/resource_he.h" #include "scumm/he/sound_he.h" -#include "sound/decoders/wave.h" +#include "audio/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 6feeb2bb8f..4770f28cbc 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -36,15 +36,15 @@ #include "common/timer.h" #include "common/util.h" -#include "sound/decoders/adpcm.h" -#include "sound/decoders/flac.h" -#include "sound/mididrv.h" -#include "sound/mixer.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" +#include "audio/decoders/adpcm.h" +#include "audio/decoders/flac.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/voc.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/wave.h" namespace Scumm { diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h index 172bcaecd4..0014480894 100644 --- a/engines/scumm/imuse/imuse_internal.h +++ b/engines/scumm/imuse/imuse_internal.h @@ -29,7 +29,7 @@ #include "scumm/imuse/imuse.h" #include "scumm/imuse/instrument.h" #include "scumm/saveload.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" class MidiParser; class OSystem; diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index a90915e438..ac2b2d4203 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -31,7 +31,7 @@ #include "scumm/saveload.h" #include "scumm/scumm.h" -#include "sound/midiparser.h" +#include "audio/midiparser.h" namespace Scumm { diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp index 57a842f297..02996c53d3 100644 --- a/engines/scumm/imuse/instrument.cpp +++ b/engines/scumm/imuse/instrument.cpp @@ -26,7 +26,7 @@ #include "scumm/scumm.h" #include "scumm/saveload.h" #include "scumm/imuse/instrument.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" namespace Scumm { diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index ceca557f06..516a0497fa 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/engines/scumm/imuse_digi/dimuse.cpp @@ -33,9 +33,9 @@ #include "scumm/imuse_digi/dimuse_bndmgr.h" #include "scumm/imuse_digi/dimuse_track.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" namespace Scumm { diff --git a/engines/scumm/imuse_digi/dimuse.h b/engines/scumm/imuse_digi/dimuse.h index bf5feeb08f..236edb5a89 100644 --- a/engines/scumm/imuse_digi/dimuse.h +++ b/engines/scumm/imuse_digi/dimuse.h @@ -34,8 +34,8 @@ #include "scumm/music.h" #include "scumm/sound.h" -#include "sound/mixer.h" -#include "sound/audiostream.h" +#include "audio/mixer.h" +#include "audio/audiostream.h" namespace Scumm { diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp index 06a629072e..02395eed4d 100644 --- a/engines/scumm/imuse_digi/dimuse_script.cpp +++ b/engines/scumm/imuse_digi/dimuse_script.cpp @@ -33,8 +33,8 @@ #include "scumm/imuse_digi/dimuse_bndmgr.h" #include "scumm/imuse_digi/dimuse_track.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" namespace Scumm { diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index 4054843163..00074a951a 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/decoders/flac.h" -#include "sound/decoders/voc.h" -#include "sound/decoders/vorbis.h" -#include "sound/decoders/mp3.h" +#include "audio/decoders/flac.h" +#include "audio/decoders/voc.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/mp3.h" #include "scumm/scumm.h" #include "scumm/util.h" diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h index aa7a1b77ca..7ae9fdccb0 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.h +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h @@ -27,7 +27,7 @@ #include "common/scummsys.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" #include "scumm/imuse_digi/dimuse_bndmgr.h" namespace Scumm { diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index c56ca40cd0..2a08d56163 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -32,8 +32,8 @@ #include "scumm/imuse_digi/dimuse_bndmgr.h" #include "scumm/imuse_digi/dimuse_track.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" namespace Scumm { diff --git a/engines/scumm/midiparser_ro.cpp b/engines/scumm/midiparser_ro.cpp index 2ef4cecfac..e737d747ac 100644 --- a/engines/scumm/midiparser_ro.cpp +++ b/engines/scumm/midiparser_ro.cpp @@ -24,8 +24,8 @@ */ -#include "sound/midiparser.h" -#include "sound/mididrv.h" +#include "audio/midiparser.h" +#include "audio/mididrv.h" #include "common/util.h" namespace Scumm { diff --git a/engines/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp index 930c85dadf..657595fab1 100644 --- a/engines/scumm/player_mod.cpp +++ b/engines/scumm/player_mod.cpp @@ -25,9 +25,9 @@ #include "scumm/player_mod.h" -#include "sound/mixer.h" -#include "sound/rate.h" -#include "sound/decoders/raw.h" +#include "audio/mixer.h" +#include "audio/rate.h" +#include "audio/decoders/raw.h" namespace Scumm { diff --git a/engines/scumm/player_mod.h b/engines/scumm/player_mod.h index 7c0e5916a3..67d1bb4cbf 100644 --- a/engines/scumm/player_mod.h +++ b/engines/scumm/player_mod.h @@ -27,8 +27,8 @@ #define SCUMM_PLAYER_MOD_H #include "scumm/scumm.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" namespace Audio { class RateConverter; diff --git a/engines/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp index 96396e7a08..5f792401e0 100644 --- a/engines/scumm/player_nes.cpp +++ b/engines/scumm/player_nes.cpp @@ -28,7 +28,7 @@ #include "engines/engine.h" #include "scumm/player_nes.h" #include "scumm/scumm.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Scumm { diff --git a/engines/scumm/player_nes.h b/engines/scumm/player_nes.h index 89292f7c24..5f6e8f2d8d 100644 --- a/engines/scumm/player_nes.h +++ b/engines/scumm/player_nes.h @@ -28,8 +28,8 @@ #include "common/scummsys.h" #include "scumm/music.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" namespace Scumm { diff --git a/engines/scumm/player_pce.h b/engines/scumm/player_pce.h index a87b6feb64..3f5033f724 100644 --- a/engines/scumm/player_pce.h +++ b/engines/scumm/player_pce.h @@ -28,8 +28,8 @@ #include "common/scummsys.h" #include "scumm/music.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" // PCE sound engine is only used by Loom, which requires 16bit color support #ifdef USE_RGB_COLOR diff --git a/engines/scumm/player_sid.cpp b/engines/scumm/player_sid.cpp index 35671e094b..34654a68c5 100644 --- a/engines/scumm/player_sid.cpp +++ b/engines/scumm/player_sid.cpp @@ -28,7 +28,7 @@ #include "engines/engine.h" #include "scumm/player_sid.h" #include "scumm/scumm.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Scumm { diff --git a/engines/scumm/player_sid.h b/engines/scumm/player_sid.h index 9e883abe74..71497cc6f4 100644 --- a/engines/scumm/player_sid.h +++ b/engines/scumm/player_sid.h @@ -29,9 +29,9 @@ #include "common/mutex.h" #include "common/scummsys.h" #include "scumm/music.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/softsynth/sid.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/softsynth/sid.h" namespace Scumm { diff --git a/engines/scumm/player_towns.h b/engines/scumm/player_towns.h index e5023d25c2..fda8bd4042 100644 --- a/engines/scumm/player_towns.h +++ b/engines/scumm/player_towns.h @@ -28,7 +28,7 @@ #include "scumm/scumm.h" #include "scumm/imuse/imuse.h" -#include "sound/softsynth/fmtowns_pc98/towns_euphony.h" +#include "audio/softsynth/fmtowns_pc98/towns_euphony.h" namespace Scumm { diff --git a/engines/scumm/player_v2base.h b/engines/scumm/player_v2base.h index 7b90ae98cf..bd910b8a78 100644 --- a/engines/scumm/player_v2base.h +++ b/engines/scumm/player_v2base.h @@ -29,8 +29,8 @@ #include "common/scummsys.h" #include "common/mutex.h" #include "scumm/music.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" namespace Scumm { diff --git a/engines/scumm/player_v2cms.cpp b/engines/scumm/player_v2cms.cpp index 7bec171173..b081a68428 100644 --- a/engines/scumm/player_v2cms.cpp +++ b/engines/scumm/player_v2cms.cpp @@ -25,9 +25,9 @@ #include "scumm/player_v2cms.h" #include "scumm/scumm.h" -#include "sound/mididrv.h" -#include "sound/mixer.h" -#include "sound/softsynth/cms.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" +#include "audio/softsynth/cms.h" namespace Scumm { diff --git a/engines/scumm/player_v4a.h b/engines/scumm/player_v4a.h index abacd8e511..108dbcf317 100644 --- a/engines/scumm/player_v4a.h +++ b/engines/scumm/player_v4a.h @@ -28,8 +28,8 @@ #include "common/scummsys.h" #include "scumm/music.h" -#include "sound/mixer.h" -#include "sound/mods/tfmx.h" +#include "audio/mixer.h" +#include "audio/mods/tfmx.h" class Mixer; diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 7273f9f871..bdae4c5f6a 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -44,7 +44,7 @@ #include "scumm/he/sprite_he.h" #include "scumm/verbs.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp index f2addff19f..1250a82d33 100644 --- a/engines/scumm/script_v8.cpp +++ b/engines/scumm/script_v8.cpp @@ -39,7 +39,7 @@ #include "scumm/verbs.h" #include "scumm/smush/smush_player.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Scumm { diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index e6110ee976..83df53d8d0 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -77,7 +77,7 @@ #include "backends/audiocd/audiocd.h" -#include "sound/mixer.h" +#include "audio/mixer.h" using Common::File; diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 1f083db4a0..587d1be776 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -42,7 +42,7 @@ #include "scumm/detection.h" #include "scumm/script.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" #ifdef __DS__ /* This disables the dual layer mode which is used in FM-Towns versions diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp index eca1ebdcab..4ab0d7c733 100644 --- a/engines/scumm/smush/smush_mixer.cpp +++ b/engines/scumm/smush/smush_mixer.cpp @@ -32,8 +32,8 @@ #include "scumm/sound.h" #include "scumm/imuse/imuse.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" namespace Scumm { diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 29dbb57670..ad8a135a7c 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -49,10 +49,10 @@ #include "scumm/insane/insane.h" -#include "sound/mixer.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/raw.h" -#include "sound/decoders/vorbis.h" +#include "audio/mixer.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/vorbis.h" #include "common/zlib.h" diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index ee8825d946..cff1618c18 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -38,15 +38,15 @@ #include "backends/audiocd/audiocd.h" -#include "sound/decoders/adpcm.h" -#include "sound/decoders/flac.h" -#include "sound/mididrv.h" -#include "sound/mixer.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" +#include "audio/decoders/adpcm.h" +#include "audio/decoders/flac.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/voc.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/wave.h" namespace Scumm { diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h index 4fe46f32f0..39b4af805d 100644 --- a/engines/scumm/sound.h +++ b/engines/scumm/sound.h @@ -26,8 +26,8 @@ #define SCUMM_SOUND_H #include "common/scummsys.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" #include "scumm/saveload.h" namespace Audio { diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index 68e84d616d..129de9c129 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -38,8 +38,8 @@ #include "sky/struc.h" #include "sky/text.h" -#include "sound/audiostream.h" -#include "sound/decoders/raw.h" +#include "audio/audiostream.h" +#include "audio/decoders/raw.h" namespace Sky { diff --git a/engines/sky/intro.h b/engines/sky/intro.h index 213361eae5..d7a55b95bb 100644 --- a/engines/sky/intro.h +++ b/engines/sky/intro.h @@ -28,7 +28,7 @@ #include "common/scummsys.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Sky { diff --git a/engines/sky/music/adlibchannel.h b/engines/sky/music/adlibchannel.h index 628ceabdb9..cbcf722e4e 100644 --- a/engines/sky/music/adlibchannel.h +++ b/engines/sky/music/adlibchannel.h @@ -27,7 +27,7 @@ #define SKY_MUSIC_ADLIBCHANNEL_H #include "sky/music/musicbase.h" -#include "sound/fmopl.h" +#include "audio/fmopl.h" namespace Sky { diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index 0b593f555b..da46964ef9 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -28,7 +28,7 @@ #include "sky/music/adlibmusic.h" #include "sky/music/adlibchannel.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "sky/sky.h" namespace Sky { diff --git a/engines/sky/music/adlibmusic.h b/engines/sky/music/adlibmusic.h index f3356a91a8..848c8eaf29 100644 --- a/engines/sky/music/adlibmusic.h +++ b/engines/sky/music/adlibmusic.h @@ -27,9 +27,9 @@ #define SKY_MUSIC_ADLIBMUSIC_H #include "sky/music/musicbase.h" -#include "sound/audiostream.h" -#include "sound/fmopl.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/fmopl.h" +#include "audio/mixer.h" namespace Sky { diff --git a/engines/sky/music/gmchannel.cpp b/engines/sky/music/gmchannel.cpp index e589642458..3852a69068 100644 --- a/engines/sky/music/gmchannel.cpp +++ b/engines/sky/music/gmchannel.cpp @@ -25,7 +25,7 @@ #include "gmchannel.h" #include "common/util.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" namespace Sky { diff --git a/engines/sky/music/gmmusic.cpp b/engines/sky/music/gmmusic.cpp index e7b3a24170..22964f3f56 100644 --- a/engines/sky/music/gmmusic.cpp +++ b/engines/sky/music/gmmusic.cpp @@ -28,7 +28,7 @@ #include "sky/sky.h" #include "common/util.h" #include "common/endian.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" namespace Sky { diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp index bdefa66709..51df95e451 100644 --- a/engines/sky/music/mt32music.cpp +++ b/engines/sky/music/mt32music.cpp @@ -28,7 +28,7 @@ #include "common/util.h" #include "common/system.h" #include "common/endian.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" namespace Sky { diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index 30f67bf5ef..14d57465af 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -44,8 +44,8 @@ #include "sky/text.h" #include "sky/compact.h" -#include "sound/mididrv.h" -#include "sound/mixer.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" #include "engines/util.h" diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index dc76cb8f0d..3d247ed334 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -33,8 +33,8 @@ #include "sky/sound.h" #include "sky/struc.h" -#include "sound/audiostream.h" -#include "sound/decoders/raw.h" +#include "audio/audiostream.h" +#include "audio/decoders/raw.h" namespace Sky { diff --git a/engines/sky/sound.h b/engines/sky/sound.h index 2aecd6ab7f..ce060ce689 100644 --- a/engines/sky/sound.h +++ b/engines/sky/sound.h @@ -28,7 +28,7 @@ #include "common/scummsys.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Sky { diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index de35b8122c..fa876b565f 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -27,7 +27,7 @@ #include "sword1/sword1.h" #include "sword1/animation.h" #include "sword1/text.h" -#include "sound/decoders/vorbis.h" +#include "audio/decoders/vorbis.h" #include "common/config-manager.h" #include "common/endian.h" diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h index 566ca31c2f..7bfd839826 100644 --- a/engines/sword1/animation.h +++ b/engines/sword1/animation.h @@ -32,7 +32,7 @@ #include "common/array.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" #include "sword1/screen.h" #include "sword1/sound.h" diff --git a/engines/sword1/logic.h b/engines/sword1/logic.h index 4ec8ad15c5..989b852e77 100644 --- a/engines/sword1/logic.h +++ b/engines/sword1/logic.h @@ -31,7 +31,7 @@ #include "sword1/objectman.h" #include "common/util.h" #include "common/random.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Sword1 { diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index d860e1c69d..2b81ae1eb4 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -32,14 +32,14 @@ #include "sword1/sword1.h" #include "sword1/music.h" -#include "sound/mixer.h" -#include "sound/audiostream.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" +#include "audio/mixer.h" +#include "audio/audiostream.h" +#include "audio/decoders/aiff.h" +#include "audio/decoders/flac.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/wave.h" +#include "audio/decoders/vag.h" #define SMP_BUFSIZE 8192 diff --git a/engines/sword1/music.h b/engines/sword1/music.h index 6487a1c3e5..7a3d1e5de6 100644 --- a/engines/sword1/music.h +++ b/engines/sword1/music.h @@ -29,9 +29,9 @@ #include "common/scummsys.h" #include "common/mutex.h" #include "common/file.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" -#include "sound/rate.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" +#include "audio/rate.h" namespace Sword1 { diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index ff2f1060ee..f8219eb21a 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -37,13 +37,13 @@ #include "sword1/logic.h" #include "sword1/sword1.h" -#include "sound/audiostream.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" +#include "audio/audiostream.h" +#include "audio/decoders/flac.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/wave.h" +#include "audio/decoders/vag.h" namespace Sword1 { diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h index ececb95875..ae96132241 100644 --- a/engines/sword1/sound.h +++ b/engines/sword1/sound.h @@ -31,7 +31,7 @@ #include "common/file.h" #include "common/util.h" #include "common/random.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Audio { class Mixer; diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h index b90726537c..550ac0fac4 100644 --- a/engines/sword2/animation.h +++ b/engines/sword2/animation.h @@ -31,7 +31,7 @@ #include "video/dxa_decoder.h" #include "video/smk_decoder.h" #include "video/video_decoder.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "sword2/screen.h" diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index 1519c5d73f..aa91843432 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -37,12 +37,12 @@ #include "common/substream.h" #include "common/system.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 "audio/decoders/mp3.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/flac.h" +#include "audio/decoders/wave.h" +#include "audio/decoders/vag.h" +#include "audio/rate.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp index abacbd16f0..261c8293bd 100644 --- a/engines/sword2/sound.cpp +++ b/engines/sword2/sound.cpp @@ -48,8 +48,8 @@ #include "sword2/resman.h" #include "sword2/sound.h" -#include "sound/decoders/wave.h" -#include "sound/decoders/vag.h" +#include "audio/decoders/wave.h" +#include "audio/decoders/vag.h" #define Debug_Printf _vm->_debugger->DebugPrintf diff --git a/engines/sword2/sound.h b/engines/sword2/sound.h index 5acc39179f..2c4c8364c7 100644 --- a/engines/sword2/sound.h +++ b/engines/sword2/sound.h @@ -39,8 +39,8 @@ #define SWORD2_SOUND_H #include "common/file.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" // Max number of sound fx #define MAXMUS 2 diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp index b72542f95a..e9901c04b0 100644 --- a/engines/sword25/fmv/theora_decoder.cpp +++ b/engines/sword25/fmv/theora_decoder.cpp @@ -42,7 +42,7 @@ #ifdef USE_THEORADEC #include "common/system.h" #include "graphics/conversion.h" -#include "sound/decoders/raw.h" +#include "audio/decoders/raw.h" #include "sword25/kernel/common.h" namespace Sword25 { diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h index 5e2675b629..a753bc58ac 100644 --- a/engines/sword25/fmv/theora_decoder.h +++ b/engines/sword25/fmv/theora_decoder.h @@ -31,8 +31,8 @@ #ifdef USE_THEORADEC #include "video/video_decoder.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" #include <theora/theoradec.h> #include <vorbis/codec.h> diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp index f28ad26fe7..03cdaf82b7 100644 --- a/engines/sword25/sfx/soundengine.cpp +++ b/engines/sword25/sfx/soundengine.cpp @@ -37,7 +37,7 @@ #include "sword25/package/packagemanager.h" #include "sword25/kernel/resource.h" -#include "sound/decoders/vorbis.h" +#include "audio/decoders/vorbis.h" namespace Sword25 { diff --git a/engines/sword25/sfx/soundengine.h b/engines/sword25/sfx/soundengine.h index 29b3043a68..576582b478 100644 --- a/engines/sword25/sfx/soundengine.h +++ b/engines/sword25/sfx/soundengine.h @@ -52,8 +52,8 @@ #include "sword25/kernel/resservice.h" #include "sword25/kernel/persistable.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" namespace Sword25 { diff --git a/engines/teenagent/music.h b/engines/teenagent/music.h index c1f5765a55..52a347bf10 100644 --- a/engines/teenagent/music.h +++ b/engines/teenagent/music.h @@ -26,7 +26,7 @@ #ifndef TEEN_MUSIC_H #define TEEN_MUSIC_H -#include "sound/mods/paula.h" +#include "audio/mods/paula.h" #include "common/array.h" namespace TeenAgent { diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp index 523c0e1700..a492237adb 100644 --- a/engines/teenagent/teenagent.cpp +++ b/engines/teenagent/teenagent.cpp @@ -33,8 +33,8 @@ #include "engines/advancedDetector.h" #include "engines/util.h" -#include "sound/mixer.h" -#include "sound/decoders/raw.h" +#include "audio/mixer.h" +#include "audio/decoders/raw.h" #include "graphics/cursorman.h" #include "graphics/thumbnail.h" diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h index 7c70866285..a43ee68f56 100644 --- a/engines/teenagent/teenagent.h +++ b/engines/teenagent/teenagent.h @@ -29,8 +29,8 @@ #include "teenagent/pack.h" #include "teenagent/resources.h" #include "teenagent/inventory.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" #include "common/random.h" struct ADGameDescription; diff --git a/engines/testbed/midi.cpp b/engines/testbed/midi.cpp index 499c44e50a..673f5d8547 100644 --- a/engines/testbed/midi.cpp +++ b/engines/testbed/midi.cpp @@ -28,7 +28,7 @@ #include "graphics/cursorman.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" #include "testbed/midi.h" #include "testbed/testbed.h" diff --git a/engines/testbed/midi.h b/engines/testbed/midi.h index 0fb5cf80d5..676229570e 100644 --- a/engines/testbed/midi.h +++ b/engines/testbed/midi.h @@ -26,7 +26,7 @@ #define TESTBED_MIDI_H #include "common/stream.h" -#include "sound/midiparser.h" +#include "audio/midiparser.h" #include "testbed/testsuite.h" // This file can be used as template for header files of other newer testsuites. diff --git a/engines/testbed/sound.cpp b/engines/testbed/sound.cpp index 8354e7bad0..76f9e850c0 100644 --- a/engines/testbed/sound.cpp +++ b/engines/testbed/sound.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "sound/softsynth/pcspk.h" +#include "audio/softsynth/pcspk.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/testbed/sound.h b/engines/testbed/sound.h index 24dcf45b99..b797ecb2b0 100644 --- a/engines/testbed/sound.h +++ b/engines/testbed/sound.h @@ -26,7 +26,7 @@ #define TESTBED_SOUND_H #include "gui/dialog.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "testbed/config.h" #include "testbed/testsuite.h" diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index f74f3e34c3..3f56288aca 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/decoders/raw.h" +#include "audio/decoders/raw.h" namespace Tinsel { diff --git a/engines/tinsel/bmv.h b/engines/tinsel/bmv.h index a0359d497d..2644504cab 100644 --- a/engines/tinsel/bmv.h +++ b/engines/tinsel/bmv.h @@ -29,8 +29,8 @@ #include "common/file.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" #include "tinsel/coroutine.h" #include "tinsel/object.h" diff --git a/engines/tinsel/config.cpp b/engines/tinsel/config.cpp index 43e54dc4ea..a206ebf03b 100644 --- a/engines/tinsel/config.cpp +++ b/engines/tinsel/config.cpp @@ -34,7 +34,7 @@ #include "common/file.h" #include "common/config-manager.h" -#include "sound/mixer.h" +#include "audio/mixer.h" namespace Tinsel { diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 23ef28a99c..29d4dbc92d 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -27,10 +27,10 @@ // MIDI and digital music class -#include "sound/audiostream.h" -#include "sound/mididrv.h" -#include "sound/midiparser.h" -#include "sound/decoders/adpcm.h" +#include "audio/audiostream.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" +#include "audio/decoders/adpcm.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/tinsel/music.h b/engines/tinsel/music.h index 069c03c979..e2a3b4c2c1 100644 --- a/engines/tinsel/music.h +++ b/engines/tinsel/music.h @@ -28,10 +28,10 @@ #ifndef TINSEL_MUSIC_H #define TINSEL_MUSIC_H -#include "sound/mididrv.h" -#include "sound/midiparser.h" -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" #include "common/mutex.h" namespace Tinsel { diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 7fab3624a4..5fc2820986 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -40,13 +40,13 @@ #include "common/memstream.h" #include "common/system.h" -#include "sound/mixer.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 "audio/mixer.h" +#include "audio/decoders/adpcm.h" +#include "audio/decoders/flac.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/vag.h" +#include "audio/decoders/vorbis.h" #include "gui/message.h" diff --git a/engines/tinsel/sound.h b/engines/tinsel/sound.h index b8990f0106..2b0ef4599e 100644 --- a/engines/tinsel/sound.h +++ b/engines/tinsel/sound.h @@ -30,7 +30,7 @@ #include "common/file.h" #include "common/file.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "tinsel/dw.h" #include "tinsel/tinsel.h" diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h index b4f77d18f2..009f6fe26d 100644 --- a/engines/tinsel/tinsel.h +++ b/engines/tinsel/tinsel.h @@ -34,8 +34,8 @@ #include "common/random.h" #include "common/util.h" -#include "sound/mididrv.h" -#include "sound/mixer.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" #include "engines/engine.h" #include "tinsel/debugger.h" diff --git a/engines/toon/audio.h b/engines/toon/audio.h index e8c6c44e03..7c1eedfee9 100644 --- a/engines/toon/audio.h +++ b/engines/toon/audio.h @@ -26,8 +26,8 @@ #ifndef TOON_AUDIO_H #define TOON_AUDIO_H -#include "sound/audiostream.h" -#include "sound/mixer.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" #include "toon/toon.h" namespace Toon { diff --git a/engines/touche/midi.cpp b/engines/touche/midi.cpp index ee7602abf7..0b15643767 100644 --- a/engines/touche/midi.cpp +++ b/engines/touche/midi.cpp @@ -26,7 +26,7 @@ #include "common/config-manager.h" #include "common/stream.h" -#include "sound/midiparser.h" +#include "audio/midiparser.h" #include "touche/midi.h" diff --git a/engines/touche/midi.h b/engines/touche/midi.h index a518a4bb29..8e43c12037 100644 --- a/engines/touche/midi.h +++ b/engines/touche/midi.h @@ -29,7 +29,7 @@ #include "common/util.h" #include "common/mutex.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" class MidiParser; diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp index f76084d556..df7992f26c 100644 --- a/engines/touche/resource.cpp +++ b/engines/touche/resource.cpp @@ -25,13 +25,13 @@ -#include "sound/decoders/flac.h" -#include "sound/mixer.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 "audio/decoders/flac.h" +#include "audio/mixer.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/voc.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/raw.h" +#include "audio/audiostream.h" #include "touche/midi.h" #include "touche/touche.h" diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp index e8d9be87d1..ff8b0d944e 100644 --- a/engines/touche/touche.cpp +++ b/engines/touche/touche.cpp @@ -34,7 +34,7 @@ #include "engines/util.h" #include "graphics/cursorman.h" -#include "sound/mididrv.h" +#include "audio/mididrv.h" #include "touche/midi.h" #include "touche/touche.h" diff --git a/engines/touche/touche.h b/engines/touche/touche.h index 926dab04b2..50a5c6e439 100644 --- a/engines/touche/touche.h +++ b/engines/touche/touche.h @@ -33,7 +33,7 @@ #include "common/rect.h" #include "common/util.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "engines/engine.h" diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp index 1d1daf5adc..6b6ab1e600 100644 --- a/engines/tucker/resource.cpp +++ b/engines/tucker/resource.cpp @@ -25,11 +25,11 @@ #include "common/file.h" -#include "sound/audiostream.h" -#include "sound/decoders/flac.h" -#include "sound/decoders/mp3.h" -#include "sound/decoders/vorbis.h" -#include "sound/decoders/wave.h" +#include "audio/audiostream.h" +#include "audio/decoders/flac.h" +#include "audio/decoders/mp3.h" +#include "audio/decoders/vorbis.h" +#include "audio/decoders/wave.h" #include "tucker/tucker.h" #include "tucker/graphics.h" diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp index 4a7a5f16d7..73018b8c00 100644 --- a/engines/tucker/sequences.cpp +++ b/engines/tucker/sequences.cpp @@ -25,9 +25,9 @@ #include "common/system.h" -#include "sound/audiostream.h" -#include "sound/decoders/raw.h" -#include "sound/decoders/wave.h" +#include "audio/audiostream.h" +#include "audio/decoders/raw.h" +#include "audio/decoders/wave.h" #include "tucker/tucker.h" #include "tucker/graphics.h" diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h index feb63c301b..4d7b530bbc 100644 --- a/engines/tucker/tucker.h +++ b/engines/tucker/tucker.h @@ -35,7 +35,7 @@ #include "video/flic_decoder.h" -#include "sound/mixer.h" +#include "audio/mixer.h" #include "engines/engine.h" |