aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2
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/sword2
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/sword2')
-rw-r--r--engines/sword2/animation.h2
-rw-r--r--engines/sword2/music.cpp12
-rw-r--r--engines/sword2/sound.cpp4
-rw-r--r--engines/sword2/sound.h4
4 files changed, 11 insertions, 11 deletions
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index b90726537c..550ac0fac4 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -31,7 +31,7 @@
#include "video/dxa_decoder.h"
#include "video/smk_decoder.h"
#include "video/video_decoder.h"
-#include "sound/mixer.h"
+#include "audio/mixer.h"
#include "sword2/screen.h"
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index 1519c5d73f..aa91843432 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -37,12 +37,12 @@
#include "common/substream.h"
#include "common/system.h"
-#include "sound/decoders/mp3.h"
-#include "sound/decoders/vorbis.h"
-#include "sound/decoders/flac.h"
-#include "sound/decoders/wave.h"
-#include "sound/decoders/vag.h"
-#include "sound/rate.h"
+#include "audio/decoders/mp3.h"
+#include "audio/decoders/vorbis.h"
+#include "audio/decoders/flac.h"
+#include "audio/decoders/wave.h"
+#include "audio/decoders/vag.h"
+#include "audio/rate.h"
#include "sword2/sword2.h"
#include "sword2/defs.h"
diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp
index abacbd16f0..261c8293bd 100644
--- a/engines/sword2/sound.cpp
+++ b/engines/sword2/sound.cpp
@@ -48,8 +48,8 @@
#include "sword2/resman.h"
#include "sword2/sound.h"
-#include "sound/decoders/wave.h"
-#include "sound/decoders/vag.h"
+#include "audio/decoders/wave.h"
+#include "audio/decoders/vag.h"
#define Debug_Printf _vm->_debugger->DebugPrintf
diff --git a/engines/sword2/sound.h b/engines/sword2/sound.h
index 5acc39179f..2c4c8364c7 100644
--- a/engines/sword2/sound.h
+++ b/engines/sword2/sound.h
@@ -39,8 +39,8 @@
#define SWORD2_SOUND_H
#include "common/file.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
// Max number of sound fx
#define MAXMUS 2