aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel
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/tinsel
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/tinsel')
-rw-r--r--engines/tinsel/bmv.cpp2
-rw-r--r--engines/tinsel/bmv.h4
-rw-r--r--engines/tinsel/config.cpp2
-rw-r--r--engines/tinsel/music.cpp8
-rw-r--r--engines/tinsel/music.h8
-rw-r--r--engines/tinsel/sound.cpp14
-rw-r--r--engines/tinsel/sound.h2
-rw-r--r--engines/tinsel/tinsel.h4
8 files changed, 22 insertions, 22 deletions
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index f74f3e34c3..3f56288aca 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -42,7 +42,7 @@
#include "tinsel/tinlib.h"
#include "tinsel/tinsel.h"
-#include "sound/decoders/raw.h"
+#include "audio/decoders/raw.h"
namespace Tinsel {
diff --git a/engines/tinsel/bmv.h b/engines/tinsel/bmv.h
index a0359d497d..2644504cab 100644
--- a/engines/tinsel/bmv.h
+++ b/engines/tinsel/bmv.h
@@ -29,8 +29,8 @@
#include "common/file.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
#include "tinsel/coroutine.h"
#include "tinsel/object.h"
diff --git a/engines/tinsel/config.cpp b/engines/tinsel/config.cpp
index 43e54dc4ea..a206ebf03b 100644
--- a/engines/tinsel/config.cpp
+++ b/engines/tinsel/config.cpp
@@ -34,7 +34,7 @@
#include "common/file.h"
#include "common/config-manager.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
namespace Tinsel {
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 23ef28a99c..29d4dbc92d 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -27,10 +27,10 @@
// MIDI and digital music class
-#include "sound/audiostream.h"
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/decoders/adpcm.h"
+#include "audio/audiostream.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/decoders/adpcm.h"
#include "backends/audiocd/audiocd.h"
diff --git a/engines/tinsel/music.h b/engines/tinsel/music.h
index 069c03c979..e2a3b4c2c1 100644
--- a/engines/tinsel/music.h
+++ b/engines/tinsel/music.h
@@ -28,10 +28,10 @@
#ifndef TINSEL_MUSIC_H
#define TINSEL_MUSIC_H
-#include "sound/mididrv.h"
-#include "sound/midiparser.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/midiparser.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
#include "common/mutex.h"
namespace Tinsel {
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index 7fab3624a4..5fc2820986 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -40,13 +40,13 @@
#include "common/memstream.h"
#include "common/system.h"
-#include "sound/mixer.h"
-#include "sound/decoders/adpcm.h"
-#include "sound/decoders/flac.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/raw.h"
-#include "sound/decoders/vag.h"
-#include "sound/decoders/vorbis.h"
+#include "audio/mixer.h"
+#include "audio/decoders/adpcm.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/raw.h"
+#include "audio/decoders/vag.h"
+#include "audio/decoders/vorbis.h"
#include "gui/message.h"
diff --git a/engines/tinsel/sound.h b/engines/tinsel/sound.h
index b8990f0106..2b0ef4599e 100644
--- a/engines/tinsel/sound.h
+++ b/engines/tinsel/sound.h
@@ -30,7 +30,7 @@
#include "common/file.h"
#include "common/file.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "tinsel/dw.h"
#include "tinsel/tinsel.h"
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index b4f77d18f2..009f6fe26d 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -34,8 +34,8 @@
#include "common/random.h"
#include "common/util.h"
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
#include "engines/engine.h"
#include "tinsel/debugger.h"