From 208dbf1d9ad1bcb6e365d5ce9092de962d1d5cd9 Mon Sep 17 00:00:00 2001 From: Walter van Niftrik Date: Thu, 21 Jan 2010 16:27:29 +0000 Subject: [PATCH] SCI: Renamed softseq/ to drivers/ svn-id: r47418 --- engines/sci/console.cpp | 2 +- engines/sci/module.mk | 8 ++++---- engines/sci/sound/{softseq => drivers}/adlib.cpp | 2 +- engines/sci/sound/{softseq => drivers}/amiga.cpp | 2 +- engines/sci/sound/{softseq => drivers}/map-mt32-to-gm.h | 0 engines/sci/sound/{softseq => drivers}/midi.cpp | 4 ++-- engines/sci/sound/{softseq => drivers}/mididriver.h | 0 engines/sci/sound/{softseq => drivers}/pcjr.cpp | 2 +- engines/sci/sound/iterator/core.cpp | 2 +- engines/sci/sound/iterator/iterator.h | 2 +- engines/sci/sound/iterator/iterator_internal.h | 2 +- engines/sci/sound/midiparser_sci.cpp | 2 +- engines/sci/sound/music.h | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) rename engines/sci/sound/{softseq => drivers}/adlib.cpp (99%) rename engines/sci/sound/{softseq => drivers}/amiga.cpp (99%) rename engines/sci/sound/{softseq => drivers}/map-mt32-to-gm.h (100%) rename engines/sci/sound/{softseq => drivers}/midi.cpp (99%) rename engines/sci/sound/{softseq => drivers}/mididriver.h (100%) rename engines/sci/sound/{softseq => drivers}/pcjr.cpp (99%) diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 325bf04ef18..e238f9e5b26 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -41,7 +41,7 @@ #else #include "sci/sound/music.h" #endif -#include "sci/sound/softseq/mididriver.h" +#include "sci/sound/drivers/mididriver.h" #include "sci/vocabulary.h" #include "sci/graphics/gui.h" #include "sci/graphics/cursor.h" diff --git a/engines/sci/module.mk b/engines/sci/module.mk index 105cdabb33e..10dc73818dc 100644 --- a/engines/sci/module.mk +++ b/engines/sci/module.mk @@ -58,10 +58,10 @@ MODULE_OBJS := \ sound/iterator/core.o \ sound/iterator/iterator.o \ sound/iterator/songlib.o \ - sound/softseq/adlib.o \ - sound/softseq/amiga.o \ - sound/softseq/pcjr.o \ - sound/softseq/midi.o \ + sound/drivers/adlib.o \ + sound/drivers/amiga.o \ + sound/drivers/pcjr.o \ + sound/drivers/midi.o \ video/seq_decoder.o \ video/vmd_decoder.o diff --git a/engines/sci/sound/softseq/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp similarity index 99% rename from engines/sci/sound/softseq/adlib.cpp rename to engines/sci/sound/drivers/adlib.cpp index 9534b5bad01..76e615dce06 100644 --- a/engines/sci/sound/softseq/adlib.cpp +++ b/engines/sci/sound/drivers/adlib.cpp @@ -29,7 +29,7 @@ #include "sound/softsynth/emumidi.h" #include "sci/resource.h" -#include "sci/sound/softseq/mididriver.h" +#include "sci/sound/drivers/mididriver.h" namespace Sci { diff --git a/engines/sci/sound/softseq/amiga.cpp b/engines/sci/sound/drivers/amiga.cpp similarity index 99% rename from engines/sci/sound/softseq/amiga.cpp rename to engines/sci/sound/drivers/amiga.cpp index 7c57bb6efd3..1dca092cc29 100644 --- a/engines/sci/sound/softseq/amiga.cpp +++ b/engines/sci/sound/drivers/amiga.cpp @@ -24,7 +24,7 @@ */ #include "sound/softsynth/emumidi.h" -#include "sci/sound/softseq/mididriver.h" +#include "sci/sound/drivers/mididriver.h" #include "common/file.h" #include "common/frac.h" diff --git a/engines/sci/sound/softseq/map-mt32-to-gm.h b/engines/sci/sound/drivers/map-mt32-to-gm.h similarity index 100% rename from engines/sci/sound/softseq/map-mt32-to-gm.h rename to engines/sci/sound/drivers/map-mt32-to-gm.h diff --git a/engines/sci/sound/softseq/midi.cpp b/engines/sci/sound/drivers/midi.cpp similarity index 99% rename from engines/sci/sound/softseq/midi.cpp rename to engines/sci/sound/drivers/midi.cpp index d32d0c529b0..07d2a3a2226 100644 --- a/engines/sci/sound/softseq/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -30,8 +30,8 @@ #include "sound/softsynth/emumidi.h" #include "sci/resource.h" -#include "sci/sound/softseq/mididriver.h" -#include "sci/sound/softseq/map-mt32-to-gm.h" +#include "sci/sound/drivers/mididriver.h" +#include "sci/sound/drivers/map-mt32-to-gm.h" namespace Sci { diff --git a/engines/sci/sound/softseq/mididriver.h b/engines/sci/sound/drivers/mididriver.h similarity index 100% rename from engines/sci/sound/softseq/mididriver.h rename to engines/sci/sound/drivers/mididriver.h diff --git a/engines/sci/sound/softseq/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp similarity index 99% rename from engines/sci/sound/softseq/pcjr.cpp rename to engines/sci/sound/drivers/pcjr.cpp index 476526b06e7..eb264fb9dd6 100644 --- a/engines/sci/sound/softseq/pcjr.cpp +++ b/engines/sci/sound/drivers/pcjr.cpp @@ -23,7 +23,7 @@ * */ -#include "sci/sound/softseq/mididriver.h" +#include "sci/sound/drivers/mididriver.h" namespace Sci { diff --git a/engines/sci/sound/iterator/core.cpp b/engines/sci/sound/iterator/core.cpp index 1a53333e4e1..c2c110a121f 100644 --- a/engines/sci/sound/iterator/core.cpp +++ b/engines/sci/sound/iterator/core.cpp @@ -30,7 +30,7 @@ #include "sci/sound/iterator/core.h" #include "sci/sound/iterator/iterator.h" -#include "sci/sound/softseq/mididriver.h" +#include "sci/sound/drivers/mididriver.h" #include "common/system.h" #include "common/timer.h" diff --git a/engines/sci/sound/iterator/iterator.h b/engines/sci/sound/iterator/iterator.h index 92a619d80e0..e5c8f507022 100644 --- a/engines/sci/sound/iterator/iterator.h +++ b/engines/sci/sound/iterator/iterator.h @@ -31,7 +31,7 @@ #include "sci/sci.h" // for USE_OLD_MUSIC_FUNCTIONS #ifdef USE_OLD_MUSIC_FUNCTIONS -#include "sci/sound/softseq/mididriver.h" +#include "sci/sound/drivers/mididriver.h" namespace Audio { class AudioStream; diff --git a/engines/sci/sound/iterator/iterator_internal.h b/engines/sci/sound/iterator/iterator_internal.h index 8eb35d7a405..5a0f0d3ec9a 100644 --- a/engines/sci/sound/iterator/iterator_internal.h +++ b/engines/sci/sound/iterator/iterator_internal.h @@ -30,7 +30,7 @@ #ifdef USE_OLD_MUSIC_FUNCTIONS #include "sci/sound/iterator/iterator.h" -#include "sci/sound/softseq/mididriver.h" +#include "sci/sound/drivers/mididriver.h" #include "common/array.h" #include "common/list.h" diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp index f8f6b5754dd..93586fbab60 100644 --- a/engines/sci/sound/midiparser_sci.cpp +++ b/engines/sci/sound/midiparser_sci.cpp @@ -26,7 +26,7 @@ #include "sci/engine/kernel.h" #include "sci/engine/state.h" #include "sci/sound/midiparser_sci.h" -#include "sci/sound/softseq/mididriver.h" +#include "sci/sound/drivers/mididriver.h" namespace Sci { diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h index 26cf3ac0ab3..2c3f2d96a68 100644 --- a/engines/sci/sound/music.h +++ b/engines/sci/sound/music.h @@ -37,7 +37,7 @@ #include "sci/sci.h" #include "sci/resource.h" -#include "sci/sound/softseq/mididriver.h" +#include "sci/sound/drivers/mididriver.h" namespace Sci {