AUDIO: Rename sound/ dir to audio/

svn-id: r55850

7 files changed, 22 insertions, 22 deletions

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;