AUDIO: Rename sound/ dir to audio/

svn-id: r55850

10 files changed, 19 insertions, 19 deletions

diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index 1e2515680f..757d2b740b 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -28,14 +28,14 @@
 #include "common/stream.h"
 #include "common/events.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 #include "video/avi_decoder.h"
 
 // Audio Codecs
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/raw.h"
 
 // Video Codecs
 #include "video/codecs/cinepak.h"
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 063df1ee72..c2551454db 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -28,8 +28,8 @@
 
 #include "video/video_decoder.h"
 #include "video/codecs/codec.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Video {
 
diff --git a/video/codecs/qdm2.cpp b/video/codecs/qdm2.cpp
index eac1954435..8678c94acd 100644
--- a/video/codecs/qdm2.cpp
+++ b/video/codecs/qdm2.cpp
@@ -30,7 +30,7 @@
 
 #ifdef GRAPHICS_QDM2_H
 
-#include "sound/audiostream.h"
+#include "audio/audiostream.h"
 #include "video/codecs/qdm2data.h"
 
 #include "common/array.h"
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index 3c092d5cf9..c8beb3b604 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -32,8 +32,8 @@
 
 #ifdef VIDEO_COKTELDECODER_H
 
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
 #include "common/memstream.h"
 
 static const uint32 kVideoCodecIndeo3 = MKID_BE('iv32');
diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h
index 152cf5941d..9c8263be9d 100644
--- a/video/coktel_decoder.h
+++ b/video/coktel_decoder.h
@@ -39,7 +39,7 @@
 
 #include "video/video_decoder.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 	class QueuingAudioStream;
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 379dc5d7a2..c855360e2b 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -41,8 +41,8 @@
 #include "common/zlib.h"
 
 // Audio codecs
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/raw.h"
 #include "video/codecs/qdm2.h"
 
 // Video codecs
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 47da683f39..809c8a718d 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -41,8 +41,8 @@
 #include "video/video_decoder.h"
 #include "video/codecs/codec.h"
 
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Common {
 	class File;
diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp
index d7412e99c3..a9f2eeeb5b 100644
--- a/video/smk_decoder.cpp
+++ b/video/smk_decoder.cpp
@@ -35,9 +35,9 @@
 #include "common/stream.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"
 
 namespace Video {
 
diff --git a/video/smk_decoder.h b/video/smk_decoder.h
index 146d8a7935..2d01909a44 100644
--- a/video/smk_decoder.h
+++ b/video/smk_decoder.h
@@ -27,7 +27,7 @@
 #define VIDEO_SMK_PLAYER_H
 
 #include "video/video_decoder.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 	class QueuingAudioStream;
diff --git a/video/video_decoder.h b/video/video_decoder.h
index 5b6c882d09..97cd133bc0 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -33,7 +33,7 @@
 #include "graphics/surface.h"
 #include "graphics/pixelformat.h"
 
-#include "sound/timestamp.h"	// TODO: Move this to common/ ?
+#include "audio/timestamp.h"	// TODO: Move this to common/ ?
 
 
 namespace Common {