aboutsummaryrefslogtreecommitdiff
path: root/engines/m4
diff options
context:
space:
mode:
authorMax Horn2011-02-09 01:09:01 +0000
committerMax Horn2011-02-09 01:09:01 +0000
commit42ab839dd6c8a1570b232101eb97f4e54de57935 (patch)
tree3b763d8913a87482b793e0348c88b9a5f40eecc9 /engines/m4
parent386203a3d6ce1abf457c9110d695408ec5f01b85 (diff)
downloadscummvm-rg350-42ab839dd6c8a1570b232101eb97f4e54de57935.tar.gz
scummvm-rg350-42ab839dd6c8a1570b232101eb97f4e54de57935.tar.bz2
scummvm-rg350-42ab839dd6c8a1570b232101eb97f4e54de57935.zip
AUDIO: Rename sound/ dir to audio/
svn-id: r55850
Diffstat (limited to 'engines/m4')
-rw-r--r--engines/m4/m4.cpp2
-rw-r--r--engines/m4/m4.h2
-rw-r--r--engines/m4/midi.h4
-rw-r--r--engines/m4/sound.cpp6
-rw-r--r--engines/m4/sound.h8
5 files changed, 11 insertions, 11 deletions
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index 73dba87e99..d557ef991b 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -61,7 +61,7 @@
#include "common/debug-channels.h"
#include "engines/util.h"
#include "graphics/surface.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
namespace M4 {
diff --git a/engines/m4/m4.h b/engines/m4/m4.h
index 8069c960f1..f665df262b 100644
--- a/engines/m4/m4.h
+++ b/engines/m4/m4.h
@@ -29,7 +29,7 @@
#include "common/scummsys.h"
#include "common/util.h"
#include "common/random.h"
-#include "sound/mididrv.h"
+#include "audio/mididrv.h"
#include "engines/engine.h"
diff --git a/engines/m4/midi.h b/engines/m4/midi.h
index 45cf23b58d..8344f8d485 100644
--- a/engines/m4/midi.h
+++ b/engines/m4/midi.h
@@ -28,8 +28,8 @@
#ifndef M4_MIDI_H
#define M4_MIDI_H
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
#include "common/mutex.h"
namespace M4 {
diff --git a/engines/m4/sound.cpp b/engines/m4/sound.cpp
index 76f0cded46..14c60c1c58 100644
--- a/engines/m4/sound.cpp
+++ b/engines/m4/sound.cpp
@@ -29,9 +29,9 @@
#include "common/stream.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 M4 {
diff --git a/engines/m4/sound.h b/engines/m4/sound.h
index 5587810506..8962e67dfd 100644
--- a/engines/m4/sound.h
+++ b/engines/m4/sound.h
@@ -30,10 +30,10 @@
#include "common/file.h"
#include "common/array.h"
-#include "sound/mixer.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
+#include "audio/mixer.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
namespace M4 {