diff --git a/TODO b/TODO index af8596d1634..6aac2939867 100644 --- a/TODO +++ b/TODO @@ -115,7 +115,6 @@ General - consider moving the MIDI stuff from sound/ to sound/midi/ - move fmopl code to softsynth dir - maybe common/system.h / system.cpp should go to backends/, too ? - - move the iMuse source files in scumm/ to a new dir scumm/imuse/ * The following things should be put into namespaces: - AudioStream and subclasses into Audio - MIDI related classes either to Audio, or a new "MIDI" namespace diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp index 79824a53d03..0870be7b445 100644 --- a/engines/scumm/akos.cpp +++ b/engines/scumm/akos.cpp @@ -26,7 +26,7 @@ #include "scumm/actor.h" #include "scumm/akos.h" #include "scumm/bomp.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/intern.h" #include "scumm/he/intern_he.h" diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp index 7ed345c5720..d953b0f24fd 100644 --- a/engines/scumm/debugger.cpp +++ b/engines/scumm/debugger.cpp @@ -30,7 +30,7 @@ #include "scumm/actor.h" #include "scumm/boxes.h" #include "scumm/debugger.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/object.h" #include "scumm/player_v2.h" #include "scumm/scumm.h" diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index e4641ae0beb..c6c7268ff6a 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -35,7 +35,7 @@ #include "scumm/dialogs.h" #include "scumm/sound.h" #include "scumm/scumm.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/player_v2.h" #include "scumm/verbs.h" diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index 1868d6b71e9..e26dd413a42 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -26,7 +26,7 @@ #include "scumm/actor.h" #include "scumm/charset.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/he/intern_he.h" #include "scumm/object.h" #include "scumm/resource.h" diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index d687844d9dc..b6f748dbba2 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -23,7 +23,7 @@ #include "common/stdafx.h" #include "scumm/actor.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/scumm.h" #include "scumm/sound.h" #include "scumm/util.h" diff --git a/engines/scumm/imuse.cpp b/engines/scumm/imuse/imuse.cpp similarity index 99% rename from engines/scumm/imuse.cpp rename to engines/scumm/imuse/imuse.cpp index a4eede49350..41e4a1aa967 100644 --- a/engines/scumm/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -28,9 +28,9 @@ #include "common/util.h" #include "common/system.h" -#include "scumm/imuse.h" -#include "scumm/imuse_internal.h" -#include "scumm/instrument.h" +#include "scumm/imuse/imuse.h" +#include "scumm/imuse/imuse_internal.h" +#include "scumm/imuse/instrument.h" #include "scumm/saveload.h" #include "scumm/scumm.h" #include "scumm/util.h" diff --git a/engines/scumm/imuse.h b/engines/scumm/imuse/imuse.h similarity index 100% rename from engines/scumm/imuse.h rename to engines/scumm/imuse/imuse.h diff --git a/engines/scumm/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h similarity index 99% rename from engines/scumm/imuse_internal.h rename to engines/scumm/imuse/imuse_internal.h index aa9b49cb006..3640cafa648 100644 --- a/engines/scumm/imuse_internal.h +++ b/engines/scumm/imuse/imuse_internal.h @@ -24,7 +24,7 @@ #define DEFINED_IMUSE_INTERNAL #include "common/scummsys.h" -#include "scumm/instrument.h" +#include "scumm/imuse/instrument.h" #include "scumm/saveload.h" #include "sound/mididrv.h" diff --git a/engines/scumm/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp similarity index 99% rename from engines/scumm/imuse_player.cpp rename to engines/scumm/imuse/imuse_player.cpp index cf40044a9d3..59cb9980213 100644 --- a/engines/scumm/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -25,7 +25,7 @@ #include "common/util.h" #include "base/engine.h" -#include "scumm/imuse_internal.h" +#include "scumm/imuse/imuse_internal.h" #include "scumm/saveload.h" #include "scumm/scumm.h" diff --git a/engines/scumm/instrument.cpp b/engines/scumm/imuse/instrument.cpp similarity index 99% rename from engines/scumm/instrument.cpp rename to engines/scumm/imuse/instrument.cpp index 6e688d89e53..16d89c5ed2f 100644 --- a/engines/scumm/instrument.cpp +++ b/engines/scumm/imuse/instrument.cpp @@ -23,7 +23,7 @@ #include "common/stdafx.h" #include "scumm/scumm.h" #include "scumm/saveload.h" -#include "scumm/instrument.h" +#include "scumm/imuse/instrument.h" #include "sound/mididrv.h" namespace Scumm { diff --git a/engines/scumm/instrument.h b/engines/scumm/imuse/instrument.h similarity index 100% rename from engines/scumm/instrument.h rename to engines/scumm/imuse/instrument.h diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 8b8dc75df1f..b2e27d15fd1 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -32,7 +32,7 @@ #include "scumm/debugger.h" #include "scumm/dialogs.h" #include "scumm/insane/insane.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #ifndef DISABLE_HE #include "scumm/he/intern_he.h" #include "scumm/he/logic_he.h" diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp index 6e769153c65..87b61e43676 100644 --- a/engines/scumm/insane/insane.cpp +++ b/engines/scumm/insane/insane.cpp @@ -31,7 +31,7 @@ #include "scumm/actor.h" #include "scumm/sound.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/smush/smush_player.h" diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk index 97b4323af64..48421458e0b 100644 --- a/engines/scumm/module.mk +++ b/engines/scumm/module.mk @@ -13,42 +13,42 @@ MODULE_OBJS := \ debugger.o \ dialogs.o \ gfx.o \ - imuse.o \ - imuse_player.o \ - input.o \ - instrument.o \ + he/script_v60he.o \ + he/sound_he.o \ help.o \ - midiparser_ro.o \ + imuse/imuse_player.o \ + imuse/imuse.o \ + imuse/instrument.o \ + input.o \ midiparser_eup.o \ + midiparser_ro.o \ object.o \ palette.o \ player_mod.o \ - player_v1.o \ player_nes.o \ + player_v1.o \ player_v2.o \ player_v2a.o \ player_v3a.o \ - resource.o \ resource_v2.o \ resource_v3.o \ resource_v4.o \ + resource.o \ room.o \ saveload.o \ - script.o \ script_c64.o \ script_v2.o \ script_v5.o \ script_v6.o \ - he/script_v60he.o \ + script.o \ scumm.o \ sound.o \ - he/sound_he.o \ string.o \ + thumbnail.o \ usage_bits.o \ util.o \ vars.o \ - verbs.o \ - thumbnail.o + verbs.o ifndef DISABLE_SCUMM_7_8 MODULE_OBJS += \ @@ -95,6 +95,8 @@ endif MODULE_DIRS += \ engines/scumm \ + engines/scumm/he \ + engines/scumm/imuse \ engines/scumm/imuse_digi \ engines/scumm/insane \ engines/scumm/smush diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp index c42e451522b..c4e606a9c4a 100644 --- a/engines/scumm/resource.cpp +++ b/engines/scumm/resource.cpp @@ -26,7 +26,7 @@ #include "scumm/charset.h" #include "scumm/dialogs.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/intern.h" #ifndef DISABLE_HE diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 2fe48e585ef..23307d64eca 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -30,7 +30,7 @@ #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/imuse_digi/dimuse.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/intern.h" #include "scumm/he/intern_he.h" #include "scumm/object.h" diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index 21dfefd76f1..6cf6e008f44 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -27,7 +27,7 @@ #include "scumm/actor.h" #include "scumm/charset.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/insane/insane.h" #include "scumm/intern.h" diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index a67b6e76f4c..5c393733cb9 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -40,7 +40,7 @@ #include "scumm/costume.h" #include "scumm/debugger.h" #include "scumm/dialogs.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/insane/insane.h" #include "scumm/intern.h" diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp index 00a50321da8..63ac6e445ca 100644 --- a/engines/scumm/smush/smush_mixer.cpp +++ b/engines/scumm/smush/smush_mixer.cpp @@ -27,7 +27,7 @@ #include "scumm/smush/channel.h" #include "scumm/scumm.h" #include "scumm/sound.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "sound/mixer.h" diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 89fe8998d71..740aeb0239d 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -32,7 +32,7 @@ #include "scumm/bomp.h" #include "scumm/imuse_digi/dimuse.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/scumm.h" #include "scumm/sound.h" #include "scumm/smush/channel.h" diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 78ed585f72c..b46b2c94f90 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -23,7 +23,7 @@ #include "common/stdafx.h" #include "scumm/actor.h" -#include "scumm/imuse.h" +#include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/scumm.h" #include "scumm/sound.h"