diff options
Diffstat (limited to 'backends')
30 files changed, 41 insertions, 41 deletions
diff --git a/backends/audiocd/default/default-audiocd.cpp b/backends/audiocd/default/default-audiocd.cpp index 6d16b26652..0acc64b7f2 100644 --- a/backends/audiocd/default/default-audiocd.cpp +++ b/backends/audiocd/default/default-audiocd.cpp @@ -24,7 +24,7 @@ */ #include "backends/audiocd/default/default-audiocd.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" #include "common/system.h" DefaultAudioCDManager::DefaultAudioCDManager() { diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h index 3f9df0bbbb..d3e0150fb6 100644 --- a/backends/audiocd/default/default-audiocd.h +++ b/backends/audiocd/default/default-audiocd.h @@ -27,7 +27,7 @@ #define BACKENDS_AUDIOCD_DEFAULT_H #include "backends/audiocd/audiocd.h" -#include "sound/mixer.h" +#include "audio/mixer.h" /** * The default audio cd manager. Implements emulation of audio cd playback. diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index fd32777a1b..953b088958 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -31,8 +31,8 @@ #include "common/config-manager.h" #include "common/util.h" -#include "sound/musicplugin.h" -#include "sound/mpu401.h" +#include "audio/musicplugin.h" +#include "audio/mpu401.h" #include <alsa/asoundlib.h> diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp index 7bf702de58..57251b45e1 100644 --- a/backends/midi/camd.cpp +++ b/backends/midi/camd.cpp @@ -31,8 +31,8 @@ #include "common/endian.h" #include "common/util.h" -#include "sound/musicplugin.h" -#include "sound/mpu401.h" +#include "audio/musicplugin.h" +#include "audio/mpu401.h" #include <proto/camd.h> #include <proto/exec.h> diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index 62e9a6d0f4..75c512cad7 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -42,8 +42,8 @@ #include "common/config-manager.h" #include "common/util.h" -#include "sound/musicplugin.h" -#include "sound/mpu401.h" +#include "audio/musicplugin.h" +#include "audio/mpu401.h" #include <CoreServices/CoreServices.h> #include <AudioToolbox/AUGraph.h> diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp index 2df9f78383..c0663352cb 100644 --- a/backends/midi/coremidi.cpp +++ b/backends/midi/coremidi.cpp @@ -31,8 +31,8 @@ #include "common/config-manager.h" #include "common/util.h" -#include "sound/musicplugin.h" -#include "sound/mpu401.h" +#include "audio/musicplugin.h" +#include "audio/mpu401.h" #include <CoreMIDI/CoreMIDI.h> diff --git a/backends/midi/dmedia.cpp b/backends/midi/dmedia.cpp index ce4ea571e0..f0ab84c934 100644 --- a/backends/midi/dmedia.cpp +++ b/backends/midi/dmedia.cpp @@ -37,8 +37,8 @@ #include "common/scummsys.h" #include "common/util.h" #include "common/config-manager.h" -#include "sound/musicplugin.h" -#include "sound/mpu401.h" +#include "audio/musicplugin.h" +#include "audio/mpu401.h" #include <dmedia/midi.h> #include <sys/types.h> diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index 74a92257bc..cc514117fb 100644 --- a/backends/midi/seq.cpp +++ b/backends/midi/seq.cpp @@ -36,8 +36,8 @@ #if defined(USE_SEQ_MIDI) #include "common/util.h" -#include "sound/musicplugin.h" -#include "sound/mpu401.h" +#include "audio/musicplugin.h" +#include "audio/mpu401.h" #include <fcntl.h> #include <unistd.h> diff --git a/backends/midi/stmidi.cpp b/backends/midi/stmidi.cpp index 6e4d69f255..562c3c7ece 100644 --- a/backends/midi/stmidi.cpp +++ b/backends/midi/stmidi.cpp @@ -42,9 +42,9 @@ #if defined __MINT__ #include <osbind.h> -#include "sound/mpu401.h" +#include "audio/mpu401.h" #include "common/util.h" -#include "sound/musicplugin.h" +#include "audio/musicplugin.h" class MidiDriver_STMIDI : public MidiDriver_MPU401 { public: diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp index f0dd24bcbd..4c0cefa156 100644 --- a/backends/midi/timidity.cpp +++ b/backends/midi/timidity.cpp @@ -44,8 +44,8 @@ #include "common/util.h" #include "common/endian.h" #include "common/str.h" -#include "sound/musicplugin.h" -#include "sound/mpu401.h" +#include "audio/musicplugin.h" +#include "audio/mpu401.h" #include <fcntl.h> #include <unistd.h> diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index a50fb4259f..b585b71fbe 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -34,8 +34,8 @@ // winnt.h defines ARRAYSIZE, but we want our own one... #undef ARRAYSIZE -#include "sound/musicplugin.h" -#include "sound/mpu401.h" +#include "audio/musicplugin.h" +#include "audio/mpu401.h" #include "common/config-manager.h" #include "common/translation.h" diff --git a/backends/mixer/sdl/sdl-mixer.h b/backends/mixer/sdl/sdl-mixer.h index 42129358aa..afb38f7f36 100644 --- a/backends/mixer/sdl/sdl-mixer.h +++ b/backends/mixer/sdl/sdl-mixer.h @@ -27,7 +27,7 @@ #define BACKENDS_MIXER_SDL_H #include "backends/platform/sdl/sdl-sys.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" /** * SDL mixer manager. It wraps the actual implementation diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index b790dab036..efcee488a5 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -56,7 +56,7 @@ #include "backends/saves/default/default-saves.h" #include "backends/timer/default/default-timer.h" #include "backends/plugins/posix/posix-provider.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #include "backends/platform/android/asset-archive.h" diff --git a/backends/platform/dc/audio.cpp b/backends/platform/dc/audio.cpp index b5667e74b0..ae63186d8c 100644 --- a/backends/platform/dc/audio.cpp +++ b/backends/platform/dc/audio.cpp @@ -25,7 +25,7 @@ #include <common/scummsys.h> #include "engines/engine.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #include "dc.h" EXTERN_C void *memcpy4s(void *s1, const void *s2, unsigned int n); diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h index f1d7454007..76c4b8cfd2 100644 --- a/backends/platform/dc/dc.h +++ b/backends/platform/dc/dc.h @@ -30,7 +30,7 @@ #include "backends/timer/default/default-timer.h" #include "backends/audiocd/default/default-audiocd.h" #include "backends/fs/fs-factory.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #define NUM_BUFFERS 4 #define SOUND_BUFFER_SHIFT 3 diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp index 531bfe2fda..bbd4f994f7 100644 --- a/backends/platform/dc/dcmain.cpp +++ b/backends/platform/dc/dcmain.cpp @@ -34,7 +34,7 @@ #include <common/memstream.h> #include "backends/plugins/dc/dc-provider.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" Icon icon; diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h index 27d75e5124..7feed7541f 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.h +++ b/backends/platform/ds/arm9/source/osystem_ds.h @@ -33,7 +33,7 @@ #include "gbampsave.h" #include "backends/saves/default/default-saves.h" #include "backends/timer/default/default-timer.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #include "graphics/surface.h" #include "graphics/colormasks.h" diff --git a/backends/platform/gph/gph-main.cpp b/backends/platform/gph/gph-main.cpp index efb71040f5..e711135c15 100644 --- a/backends/platform/gph/gph-main.cpp +++ b/backends/platform/gph/gph-main.cpp @@ -43,7 +43,7 @@ #include "backends/saves/default/default-saves.h" #include "backends/timer/default/default-timer.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #include <stdio.h> #include <stdlib.h> diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp index 9dc4e202c4..813adfbc43 100644 --- a/backends/platform/iphone/osys_main.cpp +++ b/backends/platform/iphone/osys_main.cpp @@ -41,8 +41,8 @@ #include "backends/saves/default/default-saves.h" #include "backends/timer/default/default-timer.h" -#include "sound/mixer.h" -#include "sound/mixer_intern.h" +#include "audio/mixer.h" +#include "audio/mixer_intern.h" #include "osys_main.h" diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h index df01af798a..5e88510980 100644 --- a/backends/platform/iphone/osys_main.h +++ b/backends/platform/iphone/osys_main.h @@ -27,7 +27,7 @@ #include "iphone_common.h" #include "backends/base-backend.h" #include "common/events.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #include "backends/fs/posix/posix-fs-factory.h" #include "graphics/colormasks.h" diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h index 4b2164cc9f..5264a8a82e 100644 --- a/backends/platform/n64/osys_n64.h +++ b/backends/platform/n64/osys_n64.h @@ -39,7 +39,7 @@ #include "graphics/colormasks.h" #include "graphics/pixelformat.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #include <libn64.h> #include <n64utils.h> diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp index 9b2b2ca78e..772b2b4722 100644 --- a/backends/platform/null/null.cpp +++ b/backends/platform/null/null.cpp @@ -29,7 +29,7 @@ #if defined(USE_NULL_DRIVER) #include "backends/saves/default/default-saves.h" #include "backends/timer/default/default-timer.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #include "common/scummsys.h" /* diff --git a/backends/platform/openpandora/op-main.cpp b/backends/platform/openpandora/op-main.cpp index 8b181ef3b0..6e64baddc7 100644 --- a/backends/platform/openpandora/op-main.cpp +++ b/backends/platform/openpandora/op-main.cpp @@ -44,7 +44,7 @@ #include "backends/saves/default/default-saves.h" #include "backends/timer/default/default-timer.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #include <stdio.h> #include <stdlib.h> diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index da5d55b3fc..ab7839e18f 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -57,7 +57,7 @@ #include "graphics/surface.h" #include "graphics/font.h" #include "backends/timer/default/default-timer.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #include "common/events.h" #include "backends/platform/ps2/ps2debug.h" #include "backends/fs/ps2/ps2-fs-factory.h" diff --git a/backends/platform/psp/mp3.cpp b/backends/platform/psp/mp3.cpp index 0e88418f13..54476dabfd 100644 --- a/backends/platform/psp/mp3.cpp +++ b/backends/platform/psp/mp3.cpp @@ -30,7 +30,7 @@ #include "common/singleton.h" #include "common/mutex.h" -#include "sound/audiostream.h" +#include "audio/audiostream.h" #include <pspaudiocodec.h> #include <psputility_modules.h> diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 73a030f5d1..bb7c1ff7d5 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -42,7 +42,7 @@ #include "backends/saves/psp/psp-saves.h" #include "backends/timer/default/default-timer.h" #include "graphics/surface.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" //#define __PSP_DEBUG_FUNCS__ /* For debugging function calls */ //#define __PSP_DEBUG_PRINT__ /* For debug printouts */ diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 8d274bb5bd..051449d4a0 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -29,7 +29,7 @@ #include "common/scummsys.h" #include "graphics/surface.h" #include "graphics/colormasks.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #include "backends/base-backend.h" #include "backends/fs/psp/psp-fs-factory.h" diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h index 9ed4b16d79..3c992b8bdc 100644 --- a/backends/platform/wii/osystem.h +++ b/backends/platform/wii/osystem.h @@ -37,7 +37,7 @@ #include "backends/timer/default/default-timer.h" #include "graphics/colormasks.h" #include "graphics/surface.h" -#include "sound/mixer_intern.h" +#include "audio/mixer_intern.h" #ifdef __cplusplus extern "C" { diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp index 02f107fe9e..ade90b2dfb 100644 --- a/backends/platform/wince/wince-sdl.cpp +++ b/backends/platform/wince/wince-sdl.cpp @@ -40,8 +40,8 @@ #include "base/main.h" #include "base/plugins.h" -#include "sound/mixer_intern.h" -#include "sound/fmopl.h" +#include "audio/mixer_intern.h" +#include "audio/fmopl.h" #include "backends/timer/default/default-timer.h" diff --git a/backends/plugins/elf/memory-manager.cpp b/backends/plugins/elf/memory-manager.cpp index 3682a7235d..b2ac497771 100644 --- a/backends/plugins/elf/memory-manager.cpp +++ b/backends/plugins/elf/memory-manager.cpp @@ -28,7 +28,7 @@ #if defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER) #include "backends/plugins/elf/memory-manager.h" -#include "common/util.h"
+#include "common/util.h" #include <malloc.h> DECLARE_SINGLETON(ELFMemoryManager); |