aboutsummaryrefslogtreecommitdiff
path: root/engines/sky
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sky')
-rw-r--r--engines/sky/intro.cpp4
-rw-r--r--engines/sky/intro.h2
-rw-r--r--engines/sky/music/adlibchannel.h2
-rw-r--r--engines/sky/music/adlibmusic.cpp2
-rw-r--r--engines/sky/music/adlibmusic.h6
-rw-r--r--engines/sky/music/gmchannel.cpp2
-rw-r--r--engines/sky/music/gmmusic.cpp2
-rw-r--r--engines/sky/music/mt32music.cpp2
-rw-r--r--engines/sky/sky.cpp4
-rw-r--r--engines/sky/sound.cpp4
-rw-r--r--engines/sky/sound.h2
11 files changed, 16 insertions, 16 deletions
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 {