From 42ab839dd6c8a1570b232101eb97f4e54de57935 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 9 Feb 2011 01:09:01 +0000 Subject: AUDIO: Rename sound/ dir to audio/ svn-id: r55850 --- engines/tinsel/bmv.cpp | 2 +- engines/tinsel/bmv.h | 4 ++-- engines/tinsel/config.cpp | 2 +- engines/tinsel/music.cpp | 8 ++++---- engines/tinsel/music.h | 8 ++++---- engines/tinsel/sound.cpp | 14 +++++++------- engines/tinsel/sound.h | 2 +- engines/tinsel/tinsel.h | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'engines/tinsel') 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" -- cgit v1.2.3