diff options
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/kyra_v1.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/kyra_v1.h | 2 | ||||
-rw-r--r-- | engines/kyra/lol.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/sound.cpp | 16 | ||||
-rw-r--r-- | engines/kyra/sound.h | 2 | ||||
-rw-r--r-- | engines/kyra/sound_adlib.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/sound_amiga.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/sound_digital.cpp | 8 | ||||
-rw-r--r-- | engines/kyra/sound_intern.h | 8 | ||||
-rw-r--r-- | engines/kyra/sound_lol.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/sound_pcspk.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/sound_towns.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/vqa.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/vqa.h | 2 |
14 files changed, 37 insertions, 37 deletions
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; |