AUDIO: Rename sound/ dir to audio/

svn-id: r55850

15 files changed, 29 insertions, 29 deletions

diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index f6ec60acb6..e006e22482 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -31,7 +31,7 @@
 #include "sci/sound/audio.h"
 #include "sci/sound/soundcmd.h"
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index b376ba947c..73f471b247 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -35,14 +35,14 @@
 #include "common/memstream.h"
 #include "common/system.h"
 
-#include "sound/audiostream.h"
-#include "sound/decoders/aiff.h"
-#include "sound/decoders/flac.h"
-#include "sound/decoders/mac_snd.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/wave.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/aiff.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/mac_snd.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/wave.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sound/audio.h b/engines/sci/sound/audio.h
index 92d7b946f5..4cc8575a21 100644
--- a/engines/sci/sound/audio.h
+++ b/engines/sci/sound/audio.h
@@ -28,7 +28,7 @@
 #define SCI_AUDIO_H
 
 #include "sci/engine/vm_types.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 namespace Audio {
 class RewindableAudioStream;
diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp
index 20bac4a2c0..057b7c177f 100644
--- a/engines/sci/sound/drivers/adlib.cpp
+++ b/engines/sci/sound/drivers/adlib.cpp
@@ -27,8 +27,8 @@
 
 #include "common/file.h"
 
-#include "sound/fmopl.h"
-#include "sound/softsynth/emumidi.h"
+#include "audio/fmopl.h"
+#include "audio/softsynth/emumidi.h"
 
 #include "sci/resource.h"
 #include "sci/sound/drivers/mididriver.h"
diff --git a/engines/sci/sound/drivers/amigamac.cpp b/engines/sci/sound/drivers/amigamac.cpp
index 7cf798a27e..0ec4c283f7 100644
--- a/engines/sci/sound/drivers/amigamac.cpp
+++ b/engines/sci/sound/drivers/amigamac.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sound/softsynth/emumidi.h"
+#include "audio/softsynth/emumidi.h"
 #include "sci/sound/drivers/mididriver.h"
 #include "sci/resource.h"
 
diff --git a/engines/sci/sound/drivers/cms.cpp b/engines/sci/sound/drivers/cms.cpp
index cd7b101f03..ff38e1c554 100644
--- a/engines/sci/sound/drivers/cms.cpp
+++ b/engines/sci/sound/drivers/cms.cpp
@@ -25,9 +25,9 @@
 
 #include "sci/sound/drivers/mididriver.h"
 
-#include "sound/softsynth/emumidi.h"
-#include "sound/softsynth/cms.h"
-#include "sound/mixer.h"
+#include "audio/softsynth/emumidi.h"
+#include "audio/softsynth/cms.h"
+#include "audio/mixer.h"
 
 #include "sci/resource.h"
 
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index c274c8bce2..b9a973ad7d 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -29,8 +29,8 @@
 #include "common/file.h"
 #include "common/memstream.h"
 
-#include "sound/fmopl.h"
-#include "sound/softsynth/emumidi.h"
+#include "audio/fmopl.h"
+#include "audio/softsynth/emumidi.h"
 
 #include "sci/resource.h"
 #include "sci/engine/features.h"
diff --git a/engines/sci/sound/drivers/mididriver.h b/engines/sci/sound/drivers/mididriver.h
index dabe869a8f..f745d62716 100644
--- a/engines/sci/sound/drivers/mididriver.h
+++ b/engines/sci/sound/drivers/mididriver.h
@@ -27,7 +27,7 @@
 #define SCI_SFX_SOFTSEQ_MIDIDRIVER_H
 
 #include "sci/sci.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 #include "common/error.h"
 
 namespace Sci {
diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp
index e1c3302fef..063332577e 100644
--- a/engines/sci/sound/drivers/pcjr.cpp
+++ b/engines/sci/sound/drivers/pcjr.cpp
@@ -25,7 +25,7 @@
 
 #include "sci/sound/drivers/mididriver.h"
 
-#include "sound/softsynth/emumidi.h"
+#include "audio/softsynth/emumidi.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h
index fa24a209e4..39de425e18 100644
--- a/engines/sci/sound/midiparser_sci.h
+++ b/engines/sci/sound/midiparser_sci.h
@@ -28,7 +28,7 @@
 
 #include "sci/resource.h"
 #include "sci/sound/music.h"
-#include "sound/midiparser.h"
+#include "audio/midiparser.h"
 
 /*
  Sound drivers info: (from driver cmd0)
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index d9be4ed0fe..f0963e7d64 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -23,8 +23,8 @@
  *
  */
 
-#include "sound/audiostream.h"
-#include "sound/decoders/raw.h"
+#include "audio/audiostream.h"
+#include "audio/decoders/raw.h"
 #include "common/config-manager.h"
 
 #include "sci/sci.h"
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index f735fcd6c5..dfe5ad1586 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -29,8 +29,8 @@
 #include "common/serializer.h"
 #include "common/mutex.h"
 
-#include "sound/mixer.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/audiostream.h"
 
 #include "sci/sci.h"
 #include "sci/resource.h"
diff --git a/engines/sci/sound/soundcmd.h b/engines/sci/sound/soundcmd.h
index 45b93e9a09..cae72e2cdb 100644
--- a/engines/sci/sound/soundcmd.h
+++ b/engines/sci/sound/soundcmd.h
@@ -27,7 +27,7 @@
 #define SCI_SOUNDCMD_H
 
 #include "common/list.h"
-#include "sound/mididrv.h"	// for MusicType
+#include "audio/mididrv.h"	// for MusicType
 #include "sci/engine/state.h"
 
 namespace Sci {
diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp
index 8dd60cd9a6..bf52de67d5 100644
--- a/engines/sci/video/robot_decoder.cpp
+++ b/engines/sci/video/robot_decoder.cpp
@@ -31,7 +31,7 @@
 #include "common/util.h"
 
 #include "graphics/surface.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
 
 #include "sci/resource.h"
 #include "sci/util.h"
diff --git a/engines/sci/video/robot_decoder.h b/engines/sci/video/robot_decoder.h
index b8ca0ee857..52bf0bad07 100644
--- a/engines/sci/video/robot_decoder.h
+++ b/engines/sci/video/robot_decoder.h
@@ -30,8 +30,8 @@
 #include "common/rect.h"
 #include "common/stream.h"
 #include "common/substream.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 #include "video/video_decoder.h"
 
 namespace Sci {