AUDIO: Rename sound/ dir to audio/

svn-id: r55850

12 files changed, 21 insertions, 21 deletions

diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 4d36933fef..b65bbe0d0f 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -32,7 +32,7 @@
 #include "base/plugins.h"
 #include "common/config-manager.h"
 #include "common/md5.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
 
 #include "gui/gui-manager.h"
 #include "gui/dialog.h"
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index bb27dd0888..63b2d7f681 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -28,8 +28,8 @@
 
 #include "gui/message.h"
 
-#include "sound/mixer.h"
-#include "sound/mods/infogrames.h"
+#include "audio/mixer.h"
+#include "audio/mods/infogrames.h"
 
 #include "gob/gob.h"
 #include "gob/inter.h"
diff --git a/engines/gob/sound/adlib.h b/engines/gob/sound/adlib.h
index 3f7b46643f..090841b9d6 100644
--- a/engines/gob/sound/adlib.h
+++ b/engines/gob/sound/adlib.h
@@ -27,9 +27,9 @@
 #define GOB_SOUND_ADLIB_H
 
 #include "common/mutex.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/fmopl.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/fmopl.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/bgatmosphere.h b/engines/gob/sound/bgatmosphere.h
index aabf6a7e9e..71a2263341 100644
--- a/engines/gob/sound/bgatmosphere.h
+++ b/engines/gob/sound/bgatmosphere.h
@@ -26,7 +26,7 @@
 #ifndef GOB_SOUND_BGATMOSPHERE_H
 #define GOB_SOUND_BGATMOSPHERE_H
 
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 #include "common/mutex.h"
 #include "common/random.h"
 
diff --git a/engines/gob/sound/infogrames.h b/engines/gob/sound/infogrames.h
index 4a20dceb22..cdcb0a7c39 100644
--- a/engines/gob/sound/infogrames.h
+++ b/engines/gob/sound/infogrames.h
@@ -26,8 +26,8 @@
 #ifndef GOB_SOUND_INFOGRAMES_H
 #define GOB_SOUND_INFOGRAMES_H
 
-#include "sound/mixer.h"
-#include "sound/mods/infogrames.h"
+#include "audio/mixer.h"
+#include "audio/mods/infogrames.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/pcspeaker.h b/engines/gob/sound/pcspeaker.h
index 8c4fb08021..f83d65a615 100644
--- a/engines/gob/sound/pcspeaker.h
+++ b/engines/gob/sound/pcspeaker.h
@@ -26,8 +26,8 @@
 #ifndef GOB_SOUND_PCSPEAKER_H
 #define GOB_SOUND_PCSPEAKER_H
 
-#include "sound/mixer.h"
-#include "sound/softsynth/pcspk.h"
+#include "audio/mixer.h"
+#include "audio/softsynth/pcspk.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/protracker.cpp b/engines/gob/sound/protracker.cpp
index 9c7de72c29..445d8f8cfb 100644
--- a/engines/gob/sound/protracker.cpp
+++ b/engines/gob/sound/protracker.cpp
@@ -25,7 +25,7 @@
 
 #include "common/file.h"
 
-#include "sound/mods/protracker.h"
+#include "audio/mods/protracker.h"
 
 #include "gob/sound/protracker.h"
 
diff --git a/engines/gob/sound/protracker.h b/engines/gob/sound/protracker.h
index 73cae0d510..0397efb3b7 100644
--- a/engines/gob/sound/protracker.h
+++ b/engines/gob/sound/protracker.h
@@ -26,8 +26,8 @@
 #ifndef GOB_SOUND_PROTRACKER_H
 #define GOB_SOUND_PROTRACKER_H
 
-#include "sound/mixer.h"
-#include "sound/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/audiostream.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/soundblaster.h b/engines/gob/sound/soundblaster.h
index a2dc87267c..ffe46801dc 100644
--- a/engines/gob/sound/soundblaster.h
+++ b/engines/gob/sound/soundblaster.h
@@ -27,7 +27,7 @@
 #define GOB_SOUND_SOUNDBLASTER_H
 
 #include "common/mutex.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
 
 #include "gob/sound/soundmixer.h"
 
diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp
index 8903597bb0..d33ea89147 100644
--- a/engines/gob/sound/sounddesc.cpp
+++ b/engines/gob/sound/sounddesc.cpp
@@ -25,9 +25,9 @@
 
 #include "common/util.h"
 #include "common/memstream.h"
-#include "sound/mixer.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/wave.h"
+#include "audio/mixer.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/wave.h"
 
 #include "gob/sound/sounddesc.h"
 #include "gob/resources.h"
diff --git a/engines/gob/sound/soundmixer.cpp b/engines/gob/sound/soundmixer.cpp
index 1f5cf2e053..b6082c577c 100644
--- a/engines/gob/sound/soundmixer.cpp
+++ b/engines/gob/sound/soundmixer.cpp
@@ -26,7 +26,7 @@
 #include "gob/sound/soundmixer.h"
 #include "gob/sound/sounddesc.h"
 
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
 
 namespace Gob {
 
diff --git a/engines/gob/sound/soundmixer.h b/engines/gob/sound/soundmixer.h
index 9e66c474e9..5b283b2d84 100644
--- a/engines/gob/sound/soundmixer.h
+++ b/engines/gob/sound/soundmixer.h
@@ -28,8 +28,8 @@
 
 #include "common/mutex.h"
 #include "common/frac.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
 
 namespace Gob {