diff options
Diffstat (limited to 'engines/scumm')
35 files changed, 79 insertions, 79 deletions
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 { |