[Scummvm-cvs-logs] SF.net SVN: scummvm: [32125] scummvm/branches/gsoc2008-rtl
cpage88 at users.sourceforge.net
cpage88 at users.sourceforge.net
Wed May 14 22:37:18 CEST 2008
Revision: 32125
http://scummvm.svn.sourceforge.net/scummvm/?rev=32125&view=rev
Author: cpage88
Date: 2008-05-14 13:37:18 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Merged revisions 31972-31973,31975-31981,31984-31989,31993-31994,31996-32014,32016-32020,32022-32025,32027-32028,32030,32034,32037-32038,32040-32058,32060-32087,32089-32093,32095-32123 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
Modified Paths:
--------------
scummvm/branches/gsoc2008-rtl/NEWS
scummvm/branches/gsoc2008-rtl/backends/midi/alsa.cpp
scummvm/branches/gsoc2008-rtl/backends/midi/camd.cpp
scummvm/branches/gsoc2008-rtl/backends/midi/coreaudio.cpp
scummvm/branches/gsoc2008-rtl/backends/midi/coremidi.cpp
scummvm/branches/gsoc2008-rtl/backends/midi/dmedia.cpp
scummvm/branches/gsoc2008-rtl/backends/midi/quicktime.cpp
scummvm/branches/gsoc2008-rtl/backends/midi/seq.cpp
scummvm/branches/gsoc2008-rtl/backends/midi/timidity.cpp
scummvm/branches/gsoc2008-rtl/backends/midi/windows.cpp
scummvm/branches/gsoc2008-rtl/backends/midi/ypa1.cpp
scummvm/branches/gsoc2008-rtl/backends/midi/zodiac.cpp
scummvm/branches/gsoc2008-rtl/backends/platform/dc/selector.cpp
scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/gbampsave.cpp
scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/osystem_ds.h
scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/ramsave.cpp
scummvm/branches/gsoc2008-rtl/backends/platform/wince/CELauncherDialog.cpp
scummvm/branches/gsoc2008-rtl/backends/plugins/dc/dc-provider.cpp
scummvm/branches/gsoc2008-rtl/backends/plugins/dc/dc-provider.h
scummvm/branches/gsoc2008-rtl/backends/plugins/win32/win32-provider.cpp
scummvm/branches/gsoc2008-rtl/backends/plugins/win32/win32-provider.h
scummvm/branches/gsoc2008-rtl/base/commandLine.cpp
scummvm/branches/gsoc2008-rtl/base/game.cpp
scummvm/branches/gsoc2008-rtl/base/game.h
scummvm/branches/gsoc2008-rtl/base/main.cpp
scummvm/branches/gsoc2008-rtl/base/plugins.cpp
scummvm/branches/gsoc2008-rtl/base/plugins.h
scummvm/branches/gsoc2008-rtl/configure
scummvm/branches/gsoc2008-rtl/dists/engine-data/kyra.dat
scummvm/branches/gsoc2008-rtl/dists/msvc7/gob.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc7/kyra.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc7/made.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc7/parallaction.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc7/scummvm.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc71/gob.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc71/kyra.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc71/made.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc71/parallaction.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc71/scummvm.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc8/gob.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc8/kyra.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc8/made.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc8/parallaction.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc8/scummvm.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc8_to_msvc7_71.bat
scummvm/branches/gsoc2008-rtl/dists/msvc9/gob.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc9/kyra.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc9/made.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc9/parallaction.vcproj
scummvm/branches/gsoc2008-rtl/dists/msvc9/scummvm.vcproj
scummvm/branches/gsoc2008-rtl/engines/cine/anim.cpp
scummvm/branches/gsoc2008-rtl/engines/drascula/animation.cpp
scummvm/branches/gsoc2008-rtl/engines/drascula/drascula.cpp
scummvm/branches/gsoc2008-rtl/engines/drascula/drascula.h
scummvm/branches/gsoc2008-rtl/engines/drascula/rooms.cpp
scummvm/branches/gsoc2008-rtl/engines/drascula/talk.cpp
scummvm/branches/gsoc2008-rtl/engines/drascula/texts.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/dataio.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/draw_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/gob.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/gob.h
scummvm/branches/gsoc2008-rtl/engines/gob/inter_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/module.mk
scummvm/branches/gsoc2008-rtl/engines/gob/mult_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/saveload.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/saveload.h
scummvm/branches/gsoc2008-rtl/engines/gob/saveload_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/saveload_v3.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/scenery.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/video.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/video.h
scummvm/branches/gsoc2008-rtl/engines/kyra/animator_hof.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/animator_mr.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/debugger.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/debugger.h
scummvm/branches/gsoc2008-rtl/engines/kyra/detection.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/gui.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/gui.h
scummvm/branches/gsoc2008-rtl/engines/kyra/gui_hof.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/gui_mr.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/gui_mr.h
scummvm/branches/gsoc2008-rtl/engines/kyra/gui_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/gui_v2.h
scummvm/branches/gsoc2008-rtl/engines/kyra/items_hof.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/items_mr.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/items_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_hof.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_hof.h
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_mr.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_mr.h
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_v2.h
scummvm/branches/gsoc2008-rtl/engines/kyra/module.mk
scummvm/branches/gsoc2008-rtl/engines/kyra/resource.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/resource.h
scummvm/branches/gsoc2008-rtl/engines/kyra/saveload.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/saveload_mr.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/scene_hof.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/scene_mr.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/scene_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/screen.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/screen.h
scummvm/branches/gsoc2008-rtl/engines/kyra/screen_hof.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/screen_hof.h
scummvm/branches/gsoc2008-rtl/engines/kyra/screen_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/screen_v2.h
scummvm/branches/gsoc2008-rtl/engines/kyra/script.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/script.h
scummvm/branches/gsoc2008-rtl/engines/kyra/script_hof.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/script_mr.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/script_tim.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/script_tim.h
scummvm/branches/gsoc2008-rtl/engines/kyra/script_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/seqplayer.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/seqplayer.h
scummvm/branches/gsoc2008-rtl/engines/kyra/sequences_hof.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sequences_v2.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sound.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sound.h
scummvm/branches/gsoc2008-rtl/engines/kyra/sound_adlib.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sound_digital.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sound_towns.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sprites.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sprites.h
scummvm/branches/gsoc2008-rtl/engines/kyra/staticres.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/text.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/text.h
scummvm/branches/gsoc2008-rtl/engines/kyra/text_hof.h
scummvm/branches/gsoc2008-rtl/engines/kyra/text_mr.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/timer.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/timer.h
scummvm/branches/gsoc2008-rtl/engines/kyra/vqa.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/vqa.h
scummvm/branches/gsoc2008-rtl/engines/kyra/wsamovie.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/wsamovie.h
scummvm/branches/gsoc2008-rtl/engines/m4/m4.cpp
scummvm/branches/gsoc2008-rtl/engines/made/database.cpp
scummvm/branches/gsoc2008-rtl/engines/made/database.h
scummvm/branches/gsoc2008-rtl/engines/made/made.cpp
scummvm/branches/gsoc2008-rtl/engines/made/made.h
scummvm/branches/gsoc2008-rtl/engines/made/module.mk
scummvm/branches/gsoc2008-rtl/engines/made/resource.h
scummvm/branches/gsoc2008-rtl/engines/made/screen.cpp
scummvm/branches/gsoc2008-rtl/engines/made/screen.h
scummvm/branches/gsoc2008-rtl/engines/made/script.cpp
scummvm/branches/gsoc2008-rtl/engines/made/scriptfuncs.h
scummvm/branches/gsoc2008-rtl/engines/metaengine.h
scummvm/branches/gsoc2008-rtl/engines/parallaction/callables_ns.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/debug.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/dialogue.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/exec_br.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/exec_ns.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/graphics.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/gui_br.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/gui_ns.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/inventory.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/module.mk
scummvm/branches/gsoc2008-rtl/engines/parallaction/parallaction.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/parallaction.h
scummvm/branches/gsoc2008-rtl/engines/parallaction/parallaction_br.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/parallaction_ns.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/parser.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/parser.h
scummvm/branches/gsoc2008-rtl/engines/parallaction/parser_br.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/parser_ns.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/staticres.cpp
scummvm/branches/gsoc2008-rtl/engines/scumm/detection_tables.h
scummvm/branches/gsoc2008-rtl/engines/scumm/scumm-md5.h
scummvm/branches/gsoc2008-rtl/gui/about.cpp
scummvm/branches/gsoc2008-rtl/gui/launcher.cpp
scummvm/branches/gsoc2008-rtl/gui/massadd.cpp
scummvm/branches/gsoc2008-rtl/sound/mididrv.cpp
scummvm/branches/gsoc2008-rtl/sound/mididrv.h
scummvm/branches/gsoc2008-rtl/sound/null.cpp
scummvm/branches/gsoc2008-rtl/sound/softsynth/adlib.cpp
scummvm/branches/gsoc2008-rtl/sound/softsynth/fluidsynth.cpp
scummvm/branches/gsoc2008-rtl/sound/softsynth/mt32.cpp
scummvm/branches/gsoc2008-rtl/sound/softsynth/ym2612.cpp
scummvm/branches/gsoc2008-rtl/tools/create_kyradat/create_kyradat.cpp
scummvm/branches/gsoc2008-rtl/tools/create_kyradat/create_kyradat.h
scummvm/branches/gsoc2008-rtl/tools/create_kyradat/hof_towns.h
scummvm/branches/gsoc2008-rtl/tools/create_kyradat/misc.h
scummvm/branches/gsoc2008-rtl/tools/scumm-md5.txt
Added Paths:
-----------
scummvm/branches/gsoc2008-rtl/engines/gob/saveload_v4.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/animator_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/animator_lok.h
scummvm/branches/gsoc2008-rtl/engines/kyra/gui_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/gui_lok.h
scummvm/branches/gsoc2008-rtl/engines/kyra/items_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_lok.h
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_v1.h
scummvm/branches/gsoc2008-rtl/engines/kyra/saveload_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/scene_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/scene_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/screen_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/screen_lok.h
scummvm/branches/gsoc2008-rtl/engines/kyra/script_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/script_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sequences_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sound_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/text_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/timer_lok.cpp
scummvm/branches/gsoc2008-rtl/engines/made/screenfx.cpp
scummvm/branches/gsoc2008-rtl/engines/made/screenfx.h
scummvm/branches/gsoc2008-rtl/engines/made/scriptfuncs.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/input.cpp
scummvm/branches/gsoc2008-rtl/engines/parallaction/input.h
scummvm/branches/gsoc2008-rtl/sound/midiplugin.h
scummvm/branches/gsoc2008-rtl/tools/create_kyradat/malcolm.h
Removed Paths:
-------------
scummvm/branches/gsoc2008-rtl/engines/kyra/animator_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/animator_v1.h
scummvm/branches/gsoc2008-rtl/engines/kyra/gui_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/gui_v1.h
scummvm/branches/gsoc2008-rtl/engines/kyra/items_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra.h
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/kyra_v1.h
scummvm/branches/gsoc2008-rtl/engines/kyra/saveload_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/scene.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/scene_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/screen_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/screen_v1.h
scummvm/branches/gsoc2008-rtl/engines/kyra/script_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sequences_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/sound_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/text_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/kyra/timer_v1.cpp
scummvm/branches/gsoc2008-rtl/engines/made/scriptfuncs.cpp
scummvm/branches/gsoc2008-rtl/engines/made/scriptfuncs_lgop2.cpp
scummvm/branches/gsoc2008-rtl/engines/made/scriptfuncs_mhne.cpp
scummvm/branches/gsoc2008-rtl/engines/made/scriptfuncs_rtz.cpp
Property Changed:
----------------
scummvm/branches/gsoc2008-rtl/
Property changes on: scummvm/branches/gsoc2008-rtl
___________________________________________________________________
Name: svnmerge-integrated
- /scummvm/branches/gsoc2008-gui:1-31703 /scummvm/branches/gsoc2008-tfmx:1-31765 /scummvm/trunk:1-31970
+ /scummvm/branches/gsoc2008-gui:1-31703 /scummvm/branches/gsoc2008-tfmx:1-31765 /scummvm/trunk:1-32123
Modified: scummvm/branches/gsoc2008-rtl/NEWS
===================================================================
--- scummvm/branches/gsoc2008-rtl/NEWS 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/NEWS 2008-05-14 20:37:18 UTC (rev 32125)
@@ -4,6 +4,7 @@
0.12.0 (????-??-??)
New Games:
- Added support for The Legend of Kyrandia: Book Two: Hand of Fate
+ - Added support for The Legend of Kyrandia: Book Three: Malcolm's Revenge
- Added support for Lost in Time
- Added support for the PC version of Waxworks
- Added support for the Macintosh version of I Have no Mouth, and I
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/alsa.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/alsa.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/alsa.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -26,11 +26,11 @@
#if defined(UNIX) && defined(USE_ALSA)
+#include "common/config-manager.h"
+#include "common/util.h"
+#include "sound/midiplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
-#include "common/config-manager.h"
-
#include <alsa/asoundlib.h>
/*
@@ -238,8 +238,89 @@
snd_seq_flush_output(seq_handle);
}
-MidiDriver *MidiDriver_ALSA_create() {
- return new MidiDriver_ALSA();
+
+// Plugin interface
+
+class AlsaMidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "ALSA";
+ }
+
+ virtual const char *getId() const {
+ return "alsa";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ virtual Common::StringList getDevices() const;
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+#define perm_ok(pinfo,bits) ((snd_seq_port_info_get_capability(pinfo) & (bits)) == (bits))
+
+static int check_permission(snd_seq_port_info_t *pinfo)
+{
+ if (perm_ok(pinfo, SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE)) {
+ if (!(snd_seq_port_info_get_capability(pinfo) & SND_SEQ_PORT_CAP_NO_EXPORT))
+ return 1;
+ }
+ return 0;
}
+Common::StringList AlsaMidiPlugin::getDevices() const {
+ Common::StringList devices;
+
+ snd_seq_t *seq;
+ if (snd_seq_open(&seq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0)
+ return devices; // can't open sequencer
+
+ snd_seq_client_info_t *cinfo;
+ snd_seq_client_info_alloca(&cinfo);
+ snd_seq_port_info_t *pinfo;
+ snd_seq_port_info_alloca(&pinfo);
+ snd_seq_client_info_set_client(cinfo, -1);
+ while (snd_seq_query_next_client(seq, cinfo) >= 0) {
+ bool found_valid_port = false;
+
+ /* reset query info */
+ snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
+ snd_seq_port_info_set_port(pinfo, -1);
+ while (!found_valid_port && snd_seq_query_next_port(seq, pinfo) >= 0) {
+ if (check_permission(pinfo)) {
+ found_valid_port = true;
+ devices.push_back(snd_seq_client_info_get_name(cinfo));
+ //snd_seq_client_info_get_client(cinfo) : snd_seq_port_info_get_port(pinfo)
+ }
+ }
+ }
+ snd_seq_close(seq);
+
+ return devices;
+}
+
+PluginError AlsaMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_ALSA();
+
+ return kNoError;
+}
+
+MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ AlsaMidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(ALSA)
+ //REGISTER_PLUGIN_DYNAMIC(ALSA, PLUGIN_TYPE_MIDI, AlsaMidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(ALSA, PLUGIN_TYPE_MIDI, AlsaMidiPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/camd.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/camd.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/camd.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -26,9 +26,10 @@
#if defined(__amigaos4__)
+#include "common/endian.h"
+#include "common/util.h"
+#include "sound/midiplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
-#include "common/endian.h"
#include <proto/camd.h>
#include <proto/exec.h>
@@ -162,8 +163,47 @@
_isOpen = false;
}
-MidiDriver *MidiDriver_CAMD_create() {
- return new MidiDriver_CAMD();
+
+// Plugin interface
+
+class CamdMidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "CAMD";
+ }
+
+ virtual const char *getId() const {
+ return "camd";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ //virtual Common::StringList getDevices() const;
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+PluginError CamdMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_CAMD();
+
+ return kNoError;
}
+MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ CamdMidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(CAMD)
+ //REGISTER_PLUGIN_DYNAMIC(CAMD, PLUGIN_TYPE_MIDI, CamdMidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(CAMD, PLUGIN_TYPE_MIDI, CamdMidiPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/coreaudio.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/coreaudio.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/coreaudio.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -26,6 +26,7 @@
#include "common/config-manager.h"
#include "common/util.h"
+#include "sound/midiplugin.h"
#include "sound/mpu401.h"
#include <AudioToolbox/AUGraph.h>
@@ -192,8 +193,45 @@
MusicDeviceSysEx(_synth, buf, length+2);
}
-MidiDriver *MidiDriver_CORE_create() {
- return new MidiDriver_CORE();
+
+// Plugin interface
+
+class CoreAudioMidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "CoreAudio";
+ }
+
+ virtual const char *getId() const {
+ return "core";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+PluginError CoreAudioMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_CORE();
+
+ return kNoError;
}
+MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ CoreAudioMidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(COREAUDIO)
+ //REGISTER_PLUGIN_DYNAMIC(COREAUDIO, PLUGIN_TYPE_MIDI, CoreAudioMidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(COREAUDIO, PLUGIN_TYPE_MIDI, CoreAudioMidiPlugin);
+//#endif
+
#endif // MACOSX
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/coremidi.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/coremidi.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/coremidi.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -26,6 +26,7 @@
#include "common/config-manager.h"
#include "common/util.h"
+#include "sound/midiplugin.h"
#include "sound/mpu401.h"
#include <CoreMIDI/CoreMIDI.h>
@@ -175,8 +176,45 @@
MIDISend(mOutPort, mDest, packetList);
}
-MidiDriver *MidiDriver_CoreMIDI_create() {
- return new MidiDriver_CoreMIDI();
+
+// Plugin interface
+
+class CoreMIDIMidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "CoreMIDI";
+ }
+
+ virtual const char *getId() const {
+ return "coremidi";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+PluginError CoreMIDIMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_CoreMIDI();
+
+ return kNoError;
}
+MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ CoreMIDIMidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(COREMIDI)
+ //REGISTER_PLUGIN_DYNAMIC(COREMIDI, PLUGIN_TYPE_MIDI, CoreMIDIMidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(COREMIDI, PLUGIN_TYPE_MIDI, CoreMIDIMidiPlugin);
+//#endif
+
#endif // MACOSX
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/dmedia.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/dmedia.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/dmedia.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -30,8 +30,9 @@
#if defined(IRIX)
#include "common/scummsys.h"
+#include "common/util.h"
+#include "sound/midiplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
#include <dmedia/midi.h>
#include <sys/types.h>
@@ -174,8 +175,45 @@
}
}
-MidiDriver *MidiDriver_DMEDIA_create() {
- return new MidiDriver_DMEDIA();
+
+// Plugin interface
+
+class DMediaMidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "DMedia";
+ }
+
+ virtual const char *getId() const {
+ return "dmedia";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+PluginError DMediaMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_DMEDIA();
+
+ return kNoError;
}
+MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ DMediaMidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(DMEDIA)
+ //REGISTER_PLUGIN_DYNAMIC(DMEDIA, PLUGIN_TYPE_MIDI, DMediaMidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(DMEDIA, PLUGIN_TYPE_MIDI, DMediaMidiPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/quicktime.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/quicktime.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/quicktime.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -24,10 +24,10 @@
#if defined(MACOSX) || defined(macintosh)
-
-#include "sound/mpu401.h"
#include "common/endian.h"
#include "common/util.h"
+#include "sound/midiplugin.h"
+#include "sound/mpu401.h"
#if defined(MACOSX)
#include <QuickTime/QuickTimeComponents.h>
@@ -250,8 +250,45 @@
}
}
-MidiDriver *MidiDriver_QT_create() {
- return new MidiDriver_QT();
+
+// Plugin interface
+
+class QuickTimeMidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "QuickTime";
+ }
+
+ virtual const char *getId() const {
+ return "qt";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+PluginError QuickTimeMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_QT();
+
+ return kNoError;
}
+MidiDriver *MidiDriver_QT_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ QuickTimeMidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(QT)
+ //REGISTER_PLUGIN_DYNAMIC(QT, PLUGIN_TYPE_MIDI, QuickTimeMidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(QT, PLUGIN_TYPE_MIDI, QuickTimeMidiPlugin);
+//#endif
+
#endif // MACOSX || macintosh
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/seq.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/seq.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/seq.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -30,8 +30,9 @@
#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__)
+#include "common/util.h"
+#include "sound/midiplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
#include <fcntl.h>
#include <unistd.h>
@@ -169,8 +170,45 @@
write (device, buf, position);
}
-MidiDriver *MidiDriver_SEQ_create() {
- return new MidiDriver_SEQ();
+
+// Plugin interface
+
+class SeqMidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "SEQ";
+ }
+
+ virtual const char *getId() const {
+ return "seq";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+PluginError SeqMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_SEQ();
+
+ return kNoError;
}
+MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ SeqMidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(SEQ)
+ //REGISTER_PLUGIN_DYNAMIC(SEQ, PLUGIN_TYPE_MIDI, SeqMidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(SEQ, PLUGIN_TYPE_MIDI, SeqMidiPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/timidity.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/timidity.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/timidity.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -36,8 +36,9 @@
#if defined (UNIX)
+#include "common/util.h"
+#include "sound/midiplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
#include <fcntl.h>
#include <unistd.h>
@@ -510,8 +511,45 @@
timidity_write_data(buf, position);
}
-MidiDriver *MidiDriver_TIMIDITY_create() {
- return new MidiDriver_TIMIDITY();
+
+// Plugin interface
+
+class TimidityMidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "TiMidity";
+ }
+
+ virtual const char *getId() const {
+ return "timidity";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+PluginError TimidityMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_TIMIDITY();
+
+ return kNoError;
}
+MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ TimidityMidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(TIMIDITY)
+ //REGISTER_PLUGIN_DYNAMIC(TIMIDITY, PLUGIN_TYPE_MIDI, TimidityMidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(TIMIDITY, PLUGIN_TYPE_MIDI, TimidityMidiPlugin);
+//#endif
+
#endif // defined (UNIX)
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/windows.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/windows.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/windows.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -24,12 +24,15 @@
#if defined(WIN32) && !defined(_WIN32_WCE)
+#include <windows.h>
+// winnt.h defines ARRAYSIZE, but we want our own one...
+#undef ARRAYSIZE
-#include <windows.h>
-#include <mmsystem.h>
+#include "sound/midiplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
+#include <mmsystem.h>
+
////////////////////////////////////////
//
// Windows MIDI driver
@@ -141,8 +144,45 @@
}
}
-MidiDriver *MidiDriver_WIN_create() {
- return new MidiDriver_WIN();
+
+// Plugin interface
+
+class WindowsMidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "Windows MIDI";
+ }
+
+ virtual const char *getId() const {
+ return "windows";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+PluginError WindowsMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_WIN();
+
+ return kNoError;
}
+MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ WindowsMidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(WINDOWS)
+ //REGISTER_PLUGIN_DYNAMIC(WINDOWS, PLUGIN_TYPE_MIDI, WindowsMidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(WINDOWS, PLUGIN_TYPE_MIDI, WindowsMidiPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/ypa1.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/ypa1.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/ypa1.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -22,8 +22,9 @@
* $Id$
*/
+#include "common/util.h"
+#include "sound/midiplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
#include "Pa1Lib.h"
@@ -102,6 +103,43 @@
}
}
-MidiDriver *MidiDriver_YamahaPa1_create() {
- return new MidiDriver_YamahaPa1();
+
+// Plugin interface
+
+class YamahaPa1MidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "Yamaha Pa1";
+ }
+
+ virtual const char *getId() const {
+ return "ypa1";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+PluginError YamahaPa1MidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_YamahaPa1();
+
+ return kNoError;
}
+
+MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ YamahaPa1MidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(YPA1)
+ //REGISTER_PLUGIN_DYNAMIC(YPA1, PLUGIN_TYPE_MIDI, YamahaPa1MidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(YPA1, PLUGIN_TYPE_MIDI, YamahaPa1MidiPlugin);
+//#endif
Modified: scummvm/branches/gsoc2008-rtl/backends/midi/zodiac.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/midi/zodiac.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/midi/zodiac.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -22,8 +22,9 @@
* $Id$
*/
+#include "common/util.h"
+#include "sound/midiplugin.h"
#include "sound/mpu401.h"
-#include "common/util.h"
#ifndef DISABLE_TAPWAVE
@@ -120,8 +121,45 @@
TwMidiSysEx(_midiHandle, 0, (byte *)buf, length + 2);
}
-MidiDriver *MidiDriver_Zodiac_create() {
- return new MidiDriver_Zodiac();
+
+// Plugin interface
+
+class ZodiacMidiPlugin : public MidiPluginObject {
+public:
+ virtual const char *getName() const {
+ return "Tapwave Zodiac";
+ }
+
+ virtual const char *getId() const {
+ return "zodiac";
+ }
+
+ virtual int getCapabilities() const {
+ return MDT_MIDI;
+ }
+
+ virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+};
+
+PluginError ZodiacMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+ *mididriver = new MidiDriver_Zodiac();
+
+ return kNoError;
}
+MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer) {
+ MidiDriver *mididriver;
+
+ ZodiacMidiPlugin p;
+ p.createInstance(mixer, &mididriver);
+
+ return mididriver;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(ZODIAC)
+ //REGISTER_PLUGIN_DYNAMIC(ZODIAC, PLUGIN_TYPE_MIDI, ZodiacMidiPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(ZODIAC, PLUGIN_TYPE_MIDI, ZodiacMidiPlugin);
+//#endif
+
#endif
Modified: scummvm/branches/gsoc2008-rtl/backends/platform/dc/selector.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/platform/dc/selector.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/platform/dc/selector.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -151,8 +151,8 @@
static void detectGames(FSList &files, GameList &candidates)
{
- const PluginList &plugins = PluginManager::instance().getPlugins();
- PluginList::const_iterator iter = plugins.begin();
+ const EnginePluginList &plugins = EngineMan.getPlugins();
+ EnginePluginList::const_iterator iter = plugins.begin();
for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
candidates.push_back((*iter)->detectGames(files));
}
Modified: scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/gbampsave.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/gbampsave.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/gbampsave.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -146,7 +146,7 @@
GBAMPSaveFile* GBAMPSaveFileManager::openSavefile(char const* name, bool saveOrLoad) {
char fileSpec[128];
- strcpy(fileSpec, getSavePath());
+ strcpy(fileSpec, getSavePath().c_str());
if (fileSpec[strlen(fileSpec) - 1] == '/') {
sprintf(fileSpec, "%s%s", getSavePath(), name);
@@ -169,7 +169,7 @@
enum { TYPE_NO_MORE = 0, TYPE_FILE = 1, TYPE_DIR = 2 };
char name[256];
- DS::std_cwd((char *) getSavePath());
+ DS::std_cwd((char*)getSavePath().c_str()); //TODO : Check this suspicious const-cast
// consolePrintf("Save path: '%s', pattern: '%s'\n", getSavePath(),pattern);
@@ -177,7 +177,6 @@
Common::StringList list;
-
do {
if (fileType == TYPE_FILE) {
Modified: scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/osystem_ds.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/osystem_ds.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -57,8 +57,7 @@
delete _timer;
}
-int OSystem_DS::timerHandler(int t)
-{
+int OSystem_DS::timerHandler(int t) {
DSTimerManager *tm = (DSTimerManager *)g_system->getTimerManager();
tm->handler();
return t;
@@ -183,8 +182,7 @@
}
-void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h)
-{
+void OSystem_DS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {
// consolePrintf("Copy rect %d, %d %d, %d ", x, y, w, h);
if (w <= 1) return;
@@ -229,8 +227,7 @@
}
-void OSystem_DS::updateScreen()
-{
+void OSystem_DS::updateScreen() {
if (_frameBufferExists)
{
@@ -253,30 +250,25 @@
DS::setShakePos(shakeOffset);
}
-void OSystem_DS::showOverlay ()
-{
+void OSystem_DS::showOverlay () {
// consolePrintf("showovl\n");
DS::displayMode16Bit();
}
-void OSystem_DS::hideOverlay ()
-{
+void OSystem_DS::hideOverlay () {
DS::displayMode8Bit();
}
-void OSystem_DS::clearOverlay ()
-{
+void OSystem_DS::clearOverlay () {
memset((u16 *) DS::get16BitBackBuffer(), 0, 512 * 256 * 2);
// consolePrintf("clearovl\n");
}
-void OSystem_DS::grabOverlay (OverlayColor *buf, int pitch)
-{
+void OSystem_DS::grabOverlay (OverlayColor *buf, int pitch) {
// consolePrintf("grabovl\n");
}
-void OSystem_DS::copyRectToOverlay (const OverlayColor *buf, int pitch, int x, int y, int w, int h)
-{
+void OSystem_DS::copyRectToOverlay (const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
u16* bg = (u16 *) DS::get16BitBackBuffer();
u16* src = (u16 *) buf;
@@ -313,27 +305,23 @@
}
-int16 OSystem_DS::getOverlayHeight()
-{
+int16 OSystem_DS::getOverlayHeight() {
// consolePrintf("getovlheight\n");
return getHeight();
}
-int16 OSystem_DS::getOverlayWidth()
-{
+int16 OSystem_DS::getOverlayWidth() {
// consolePrintf("getovlwid\n");
return getWidth();
}
-bool OSystem_DS::showMouse(bool visible)
-{
+bool OSystem_DS::showMouse(bool visible) {
DS::setShowCursor(visible);
return true;
}
-void OSystem_DS::warpMouse(int x, int y)
-{
+void OSystem_DS::warpMouse(int x, int y) {
}
void OSystem_DS::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int targetCursorScale) {
@@ -344,8 +332,7 @@
eventQueue[queuePos++] = e;
}
-bool OSystem_DS::pollEvent(Common::Event &event)
-{
+bool OSystem_DS::pollEvent(Common::Event &event) {
if (lastPenFrame != DS::getMillis()) {
@@ -398,13 +385,11 @@
return false;
}
-uint32 OSystem_DS::getMillis()
-{
+uint32 OSystem_DS::getMillis() {
return DS::getMillis();
}
-void OSystem_DS::delayMillis(uint msecs)
-{
+void OSystem_DS::delayMillis(uint msecs) {
int st = getMillis();
DS::addEventsToQueue();
DS::CD::update();
@@ -419,25 +404,25 @@
DS::addEventsToQueue();
}
-OSystem::MutexRef OSystem_DS::createMutex(void)
-{
+void OSystem_DS::getTimeAndDate(struct tm &t) const {
+ time_t curTime = time(0);
+ t = *localtime(&curTime);
+}
+
+OSystem::MutexRef OSystem_DS::createMutex(void) {
return NULL;
}
-void OSystem_DS::lockMutex(MutexRef mutex)
-{
+void OSystem_DS::lockMutex(MutexRef mutex) {
}
-void OSystem_DS::unlockMutex(MutexRef mutex)
-{
+void OSystem_DS::unlockMutex(MutexRef mutex) {
}
-void OSystem_DS::deleteMutex(MutexRef mutex)
-{
+void OSystem_DS::deleteMutex(MutexRef mutex) {
}
-void OSystem_DS::clearSoundCallback()
-{
+void OSystem_DS::clearSoundCallback() {
consolePrintf("Clearing sound callback");
// DS::setSoundProc(NULL, NULL);
}
@@ -447,23 +432,19 @@
return DS::getSoundFrequency();
}
-bool OSystem_DS::openCD(int drive)
-{
+bool OSystem_DS::openCD(int drive) {
return DS::CD::checkCD();
}
-bool OSystem_DS::pollCD()
-{
+bool OSystem_DS::pollCD() {
return DS::CD::isPlaying();
}
-void OSystem_DS::playCD(int track, int num_loops, int start_frame, int duration)
-{
+void OSystem_DS::playCD(int track, int num_loops, int start_frame, int duration) {
DS::CD::playTrack(track, num_loops, start_frame, duration);
}
-void OSystem_DS::stopCD()
-{
+void OSystem_DS::stopCD() {
DS::CD::stopTrack();
}
@@ -471,8 +452,7 @@
{
}
-void OSystem_DS::quit()
-{
+void OSystem_DS::quit() {
/* consolePrintf("Soft resetting...");
IPC->reset = 1;
REG_IE = 0;
@@ -481,16 +461,13 @@
swiSoftReset();*/
}
-void OSystem_DS::setWindowCaption(const char *caption)
-{
+void OSystem_DS::setWindowCaption(const char *caption) {
}
-void OSystem_DS::displayMessageOnOSD(const char *msg)
-{
+void OSystem_DS::displayMessageOnOSD(const char *msg) {
}
-Common::SaveFileManager* OSystem_DS::getSavefileManager()
-{
+Common::SaveFileManager* OSystem_DS::getSavefileManager() {
bool forceSram;
if (ConfMan.hasKey("forcesramsave", "ds")) {
Modified: scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/osystem_ds.h 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/osystem_ds.h 2008-05-14 20:37:18 UTC (rev 32125)
@@ -107,6 +107,7 @@
virtual bool pollEvent(Common::Event &event);
virtual uint32 getMillis();
virtual void delayMillis(uint msecs);
+ virtual void getTimeAndDate(struct tm &t) const;
virtual MutexRef createMutex(void);
virtual void lockMutex(MutexRef mutex);
Modified: scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/ramsave.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/ramsave.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/platform/ds/arm9/source/ramsave.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -383,16 +383,24 @@
flushToSaveRAM();
}
-void DSSaveFileManager::removeSavefile(const char *filename) {
- TODO: Implement this. Most likely, you just have to use the code of deleteFile?
+bool DSSaveFileManager::removeSavefile(const char *filename) {
+ consolePrintf("DSSaveFileManager::removeSavefile : Not implemented yet.\n");
+ assert(false);
+ //TODO: Implement this. Most likely, you just have to use the code of deleteFile?
+ return false;
}
Common::StringList DSSaveFileManager::listSavefiles(const char *pattern) {
+ consolePrintf("DSSaveFileManager::listSavefiles : Not implemented yet.\n");
+ assert(false);
+ return Common::StringList();
+ /*
TODO: Implement this. If you don't understand what it should do, just ask
(e.g. on scummvm-devel or Fingolfin). It should be pretty simple if you
use Common::matchString from common/util.h and read the Doxygen docs,
then combine this with the old code below...
+ */
/*
void DSSaveFileManager::listSavefiles(const char *prefix, bool *marks, int num) {
Modified: scummvm/branches/gsoc2008-rtl/backends/platform/wince/CELauncherDialog.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/platform/wince/CELauncherDialog.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/platform/wince/CELauncherDialog.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -77,7 +77,7 @@
FSList files;
node.getChildren(files, FilesystemNode::kListFilesOnly);
// detect
- GameList candidates(PluginManager::instance().detectGames(files));
+ GameList candidates(EngineMan.detectGames(files));
// insert
if (candidates.size() >= 1) {
GameDescriptor result = candidates[0];
Modified: scummvm/branches/gsoc2008-rtl/backends/plugins/dc/dc-provider.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/plugins/dc/dc-provider.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/plugins/dc/dc-provider.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -83,9 +83,17 @@
};
-Plugin* SDLPluginProvider::createPlugin(const Common::String &filename) const {
+Plugin* DCPluginProvider::createPlugin(const Common::String &filename) const {
return new DCPlugin(filename);
}
+bool DCPluginProvider::isPluginFilename(const Common::String &filename) const {
+ // Check the plugin suffix
+ if (!filename.hasSuffix(".PLG"))
+ return false;
+ return true;
+}
+
+
#endif // defined(DYNAMIC_MODULES) && defined(__DC__)
Modified: scummvm/branches/gsoc2008-rtl/backends/plugins/dc/dc-provider.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/plugins/dc/dc-provider.h 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/plugins/dc/dc-provider.h 2008-05-14 20:37:18 UTC (rev 32125)
@@ -34,8 +34,7 @@
protected:
Plugin* createPlugin(const Common::String &filename) const;
- virtual const char* getPrefix() const { return ""; }
- virtual const char* getSuffix() const { return ".PLG"; }
+ bool isPluginFilename(const Common::String &filename) const;
virtual void addCustomDirectories(Common::StringList &dirs) const {
dirs.push_back("/");
Modified: scummvm/branches/gsoc2008-rtl/backends/plugins/win32/win32-provider.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/plugins/win32/win32-provider.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/plugins/win32/win32-provider.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -107,5 +107,13 @@
return new Win32Plugin(filename);
}
+bool Win32PluginProvider::isPluginFilename(const Common::String &filename) const {
+ // Check the plugin suffix
+ if (!filename.hasSuffix(".dll"))
+ return false;
+ return true;
+}
+
+
#endif // defined(DYNAMIC_MODULES) && defined(_WIN32)
Modified: scummvm/branches/gsoc2008-rtl/backends/plugins/win32/win32-provider.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/plugins/win32/win32-provider.h 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/backends/plugins/win32/win32-provider.h 2008-05-14 20:37:18 UTC (rev 32125)
@@ -34,8 +34,7 @@
protected:
Plugin* createPlugin(const Common::String &filename) const;
- virtual const char* getPrefix() const { return ""; }
- virtual const char* getSuffix() const { return ".dll"; }
+ bool isPluginFilename(const Common::String &filename) const;
virtual void addCustomDirectories(Common::StringList &dirs) const {}
};
Modified: scummvm/branches/gsoc2008-rtl/base/commandLine.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/base/commandLine.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/base/commandLine.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -23,7 +23,7 @@
*
*/
-#include "engines/engine.h"
+#include "engines/metaengine.h"
#include "base/commandLine.h"
#include "base/plugins.h"
#include "base/version.h"
@@ -559,10 +559,10 @@
printf("Game ID Full Title \n"
"-------------------- ------------------------------------------------------\n");
- const PluginList &plugins = PluginManager::instance().getPlugins();
- PluginList::const_iterator iter = plugins.begin();
+ const EnginePlugin::list &plugins = EngineMan.getPlugins();
+ EnginePlugin::list::const_iterator iter = plugins.begin();
for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
- GameList list = (*iter)->getSupportedGames();
+ GameList list = (**iter)->getSupportedGames();
for (GameList::iterator v = list.begin(); v != list.end(); ++v) {
printf("%-20s %s\n", v->gameid().c_str(), v->description().c_str());
}
@@ -586,7 +586,7 @@
// to find the proper desc. In fact, the platform probably should
// be taken into account, too.
Common::String gameid(name);
- GameDescriptor g = Base::findGame(gameid);
+ GameDescriptor g = EngineMan.findGame(gameid);
if (g.description().size() > 0)
description = g.description();
}
@@ -613,8 +613,8 @@
gameid.toLowercase(); // Normalize it to lower case
// Find the plugin that will handle the specified gameid
- const Plugin *plugin = 0;
- GameDescriptor game = Base::findGame(gameid, &plugin);
+ const EnginePlugin *plugin = 0;
+ GameDescriptor game = EngineMan.findGame(gameid, &plugin);
if (!plugin) {
error("Could not find any plugin to handle gameid '%s' (target '%s')", gameid.c_str(), target);
@@ -622,7 +622,7 @@
}
// Query the plugin for a list of savegames
- SaveStateList saveList = plugin->listSaves(target);
+ SaveStateList saveList = (*plugin)->listSaves(target);
// TODO: Include more info about the target (desc, engine name, ...) ???
printf("Saves for target '%s':\n", target);
@@ -667,7 +667,7 @@
continue;
}
- GameList candidates(PluginManager::instance().detectGames(files));
+ GameList candidates(EngineMan.detectGames(files));
bool gameidDiffers = false;
GameList::iterator x;
for (x = candidates.begin(); x != candidates.end(); ++x) {
@@ -740,7 +740,7 @@
// domain (i.e. a target) matching this argument, or alternatively
// whether there is a gameid matching that name.
if (!command.empty()) {
- GameDescriptor gd = Base::findGame(command);
+ GameDescriptor gd = EngineMan.findGame(command);
if (ConfMan.hasGameDomain(command) || !gd.gameid().empty()) {
bool idCameFromCommandLine = false;
Modified: scummvm/branches/gsoc2008-rtl/base/game.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/base/game.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/base/game.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -75,29 +75,3 @@
}
_thumbnail = t;
}
-
-
-namespace Base {
-
-// TODO: Find a better name & place for this function.
-GameDescriptor findGame(const Common::String &gameName, const Plugin **plugin) {
- // Find the GameDescriptor for this target
- const PluginList &plugins = PluginManager::instance().getPlugins();
- GameDescriptor result;
-
- if (plugin)
- *plugin = 0;
-
- PluginList::const_iterator iter = plugins.begin();
- for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
- result = (*iter)->findGame(gameName.c_str());
- if (!result.gameid().empty()) {
- if (plugin)
- *plugin = *iter;
- break;
- }
- }
- return result;
-}
-
-} // End of namespace Base
Modified: scummvm/branches/gsoc2008-rtl/base/game.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/base/game.h 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/base/game.h 2008-05-14 20:37:18 UTC (rev 32125)
@@ -179,15 +179,4 @@
/** List of savestates. */
typedef Common::Array<SaveStateDescriptor> SaveStateList;
-
-class Plugin;
-
-namespace Base {
-
-// TODO: Find a better name & place for this function.
-GameDescriptor findGame(const Common::String &gameName, const Plugin **plugin = NULL);
-
-} // End of namespace Base
-
-
#endif
Modified: scummvm/branches/gsoc2008-rtl/base/main.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/base/main.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/base/main.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -32,6 +32,7 @@
*/
#include "engines/engine.h"
+#include "engines/metaengine.h"
#include "base/commandLine.h"
#include "base/plugins.h"
#include "base/version.h"
@@ -77,8 +78,8 @@
return (dlg.runModal() != -1);
}
-static const Plugin *detectPlugin() {
- const Plugin *plugin = 0;
+static const EnginePlugin *detectPlugin() {
+ const EnginePlugin *plugin = 0;
// Make sure the gameid is set in the config manager, and that it is lowercase.
Common::String gameid(ConfMan.getActiveDomainName());
@@ -90,7 +91,7 @@
// Query the plugins and find one that will handle the specified gameid
printf("Looking for %s\n", gameid.c_str());
- GameDescriptor game = Base::findGame(gameid, &plugin);
+ GameDescriptor game = EngineMan.findGame(gameid, &plugin);
if (plugin == 0) {
printf("Failed game detection\n");
@@ -105,7 +106,7 @@
}
// TODO: specify the possible return values here
-static int runGame(const Plugin *plugin, OSystem &system, const Common::String &edebuglevels) {
+static int runGame(const EnginePlugin *plugin, OSystem &system, const Common::String &edebuglevels) {
Common::String gameDataPath(ConfMan.get("path"));
if (gameDataPath.empty()) {
} else if (gameDataPath.lastChar() != '/'
@@ -138,7 +139,7 @@
// Create the game engine
Engine *engine = 0;
- PluginError err = plugin->createInstance(&system, &engine);
+ PluginError err = (*plugin)->createInstance(&system, &engine);
if (!engine || err != kNoError) {
// TODO: Show an error dialog or so?
// TODO: Also take 'err' into consideration...
@@ -168,7 +169,7 @@
// Set the window caption to the game name
Common::String caption(ConfMan.get("description"));
- Common::String desc = Base::findGame(ConfMan.get("gameid")).description();
+ Common::String desc = EngineMan.findGame(ConfMan.get("gameid")).description();
if (caption.empty() && !desc.empty())
caption = desc;
if (caption.empty())
@@ -300,11 +301,11 @@
// cleanly, so this is now enabled to encourage people to fix bits :)
while (0 != ConfMan.getActiveDomain()) {
// Try to find a plugin which feels responsible for the specified game.
- const Plugin *plugin = detectPlugin();
+ const EnginePlugin *plugin = detectPlugin();
if (plugin) {
// Unload all plugins not needed for this game,
// to save memory
- PluginManager::instance().unloadPluginsExcept(plugin);
+ PluginManager::instance().unloadPluginsExcept(PLUGIN_TYPE_ENGINE, plugin);
// Try to run the game
int result = runGame(plugin, system, specialDebug);
@@ -331,7 +332,7 @@
launcherDialog(system);
}
- PluginManager::instance().unloadPluginsExcept(NULL);
+ PluginManager::instance().unloadPlugins();
PluginManager::destroy();
Common::ConfigManager::destroy();
GUI::NewGui::destroy();
Modified: scummvm/branches/gsoc2008-rtl/base/plugins.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/base/plugins.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/base/plugins.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -24,16 +24,21 @@
*/
#include "base/plugins.h"
-#include "common/util.h"
#ifdef DYNAMIC_MODULES
#include "common/config-manager.h"
#endif
+// Plugin versioning
+
int pluginTypeVersions[PLUGIN_TYPE_MAX] = {
PLUGIN_TYPE_ENGINE_VERSION,
+ PLUGIN_TYPE_MIDI_VERSION,
};
+
+// Abstract plugins
+
PluginType Plugin::getType() const {
return _type;
}
@@ -42,31 +47,6 @@
return _pluginObject->getName();
}
-const char *Plugin::getCopyright() const {
- return ((MetaEngine*)_pluginObject)->getCopyright();
-}
-
-PluginError Plugin::createInstance(OSystem *syst, Engine **engine) const {
- return ((MetaEngine*)_pluginObject)->createInstance(syst, engine);
-}
-
-GameList Plugin::getSupportedGames() const {
- return ((MetaEngine*)_pluginObject)->getSupportedGames();
-}
-
-GameDescriptor Plugin::findGame(const char *gameid) const {
- return ((MetaEngine*)_pluginObject)->findGame(gameid);
-}
-
-GameList Plugin::detectGames(const FSList &fslist) const {
- return ((MetaEngine*)_pluginObject)->detectGames(fslist);
-}
-
-SaveStateList Plugin::listSaves(const char *target) const {
- return ((MetaEngine*)_pluginObject)->listSaves(target);
-}
-
-
class StaticPlugin : public Plugin {
public:
StaticPlugin(PluginObject *pluginobject, PluginType type) {
@@ -103,6 +83,7 @@
// "Loader" for the static plugins.
// Iterate over all registered (static) plugins and load them.
+ // Engine plugins
#if PLUGIN_ENABLED_STATIC(SCUMM)
LINK_PLUGIN(SCUMM)
#endif
@@ -161,6 +142,49 @@
LINK_PLUGIN(TOUCHE)
#endif
+ // MIDI plugins
+ // TODO: Use defines to disable or enable each MIDI driver as a
+ // static/dynamic plugin, like it's done for the engines
+ LINK_PLUGIN(NULL)
+ #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+ LINK_PLUGIN(WINDOWS)
+ #endif
+ #if defined(UNIX) && defined(USE_ALSA)
+ LINK_PLUGIN(ALSA)
+ #endif
+ #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__)
+ LINK_PLUGIN(SEQ)
+ #endif
+ #if defined(IRIX)
+ LINK_PLUGIN(DMEDIA)
+ #endif
+ #if defined(__amigaos4__)
+ LINK_PLUGIN(CAMD)
+ #endif
+ #if defined(MACOSX)
+ LINK_PLUGIN(COREAUDIO)
+ LINK_PLUGIN(COREMIDI)
+ LINK_PLUGIN(QUICKTIME)
+ #endif
+ #if defined(PALMOS_MODE)
+ # if defined(COMPILE_CLIE)
+ LINK_PLUGIN(YPA1)
+ # elif defined(COMPILE_ZODIAC) && (!defined(ENABLE_SCUMM) || !defined(PALMOS_ARM))
+ LINK_PLUGIN(ZODIAC)
+ # endif
+ #endif
+ #ifdef USE_FLUIDSYNTH
+ LINK_PLUGIN(FLUIDSYNTH)
+ #endif
+ #ifdef USE_MT32EMU
+ LINK_PLUGIN(MT32)
+ #endif
+ LINK_PLUGIN(ADLIB)
+ LINK_PLUGIN(TOWNS)
+ #if defined (UNIX)
+ LINK_PLUGIN(TIMIDITY)
+ #endif
+
return pl;
}
};
@@ -171,38 +195,34 @@
PluginList pl;
// Prepare the list of directories to search
- Common::StringList pluginDirs;
+ FSList pluginDirs;
// Add the default directories
- pluginDirs.push_back(".");
- pluginDirs.push_back("plugins");
+ pluginDirs.push_back(FilesystemNode("."));
+ pluginDirs.push_back(FilesystemNode("plugins"));
// Add the provider's custom directories
addCustomDirectories(pluginDirs);
// Add the user specified directory
Common::String pluginsPath(ConfMan.get("pluginspath"));
- if (!pluginsPath.empty()) {
- FilesystemNode dir(pluginsPath);
- pluginDirs.push_back(dir.getPath());
- }
+ if (!pluginsPath.empty())
+ pluginDirs.push_back(FilesystemNode(pluginsPath));
- Common::StringList::const_iterator d;
- for (d = pluginDirs.begin(); d != pluginDirs.end(); d++) {
+ FSList::const_iterator dir;
+ for (dir = pluginDirs.begin(); dir != pluginDirs.end(); dir++) {
// Load all plugins.
// Scan for all plugins in this directory
- FilesystemNode dir(*d);
FSList files;
- if (!dir.getChildren(files, FilesystemNode::kListFilesOnly)) {
- debug(1, "Couldn't open plugin directory '%s'", d->c_str());
+ if (!dir->getChildren(files, FilesystemNode::kListFilesOnly)) {
+ debug(1, "Couldn't open plugin directory '%s'", dir->getPath().c_str());
continue;
} else {
- debug(1, "Reading plugins from plugin directory '%s'", d->c_str());
+ debug(1, "Reading plugins from plugin directory '%s'", dir->getPath().c_str());
}
for (FSList::const_iterator i = files.begin(); i != files.end(); ++i) {
- Common::String name(i->getName());
- if (name.hasPrefix(getPrefix()) && name.hasSuffix(getSuffix())) {
+ if (isPluginFilename(i->getName())) {
pl.push_back(createPlugin(i->getPath()));
}
}
@@ -211,25 +231,25 @@
return pl;
}
-const char* FilePluginProvider::getPrefix() const {
+bool FilePluginProvider::isPluginFilename(const Common::String &filename) const {
#ifdef PLUGIN_PREFIX
- return PLUGIN_PREFIX;
-#else
- return "";
+ // Check the plugin prefix
+ if (!filename.hasPrefix(PLUGIN_PREFIX))
+ return false;
#endif
-}
-const char* FilePluginProvider::getSuffix() const {
#ifdef PLUGIN_SUFFIX
- return PLUGIN_SUFFIX;
-#else
- return "";
+ // Check the plugin suffix
+ if (!filename.hasSuffix(PLUGIN_SUFFIX))
+ return false;
#endif
+
+ return true;
}
-void FilePluginProvider::addCustomDirectories(Common::StringList &dirs) const {
+void FilePluginProvider::addCustomDirectories(FSList &dirs) const {
#ifdef PLUGIN_DIRECTORY
- dirs.push_back(PLUGIN_DIRECTORY);
+ dirs.push_back(FilesystemNode(PLUGIN_DIRECTORY));
#endif
}
@@ -273,12 +293,13 @@
}
void PluginManager::unloadPlugins() {
- unloadPluginsExcept(NULL);
+ for (int i = 0; i < PLUGIN_TYPE_MAX; i++)
+ unloadPluginsExcept((PluginType)i, NULL);
}
-void PluginManager::unloadPluginsExcept(const Plugin *plugin) {
+void PluginManager::unloadPluginsExcept(PluginType type, const Plugin *plugin) {
Plugin *found = NULL;
- for (PluginList::iterator p = _plugins.begin(); p != _plugins.end(); ++p) {
+ for (PluginList::iterator p = _plugins[type].begin(); p != _plugins[type].end(); ++p) {
if (*p == plugin) {
found = *p;
} else {
@@ -286,9 +307,9 @@
delete *p;
}
}
- _plugins.clear();
+ _plugins[type].clear();
if (found != NULL) {
- _plugins.push_back(found);
+ _plugins[type].push_back(found);
}
}
@@ -296,17 +317,27 @@
assert(plugin);
// Try to load the plugin
if (plugin->loadPlugin()) {
- // If successful, add it to the list of known plugins and return.
- _plugins.push_back(plugin);
+ // The plugin is valid, see if it provides the same module as an
+ // already loaded one and should replace it.
+ bool found = false;
- // TODO/FIXME: We should perform some additional checks here:
- // * Check for some kind of "API version" (possibly derived from the
- // SVN tree revision?)
- // * If two plugins provide the same engine, we should only load one.
- // To detect this situation, we could just compare the plugin name.
- // To handle it, simply prefer modules loaded earlier to those coming.
- // Or vice versa... to be determined... :-)
+ PluginList::iterator pl = _plugins[plugin->getType()].begin();
+ while (!found && pl != _plugins[plugin->getType()].end()) {
+ if (!strcmp(plugin->getName(), (*pl)->getName())) {
+ // Found a duplicated module. Replace the old one.
+ found = true;
+ delete *pl;
+ *pl = plugin;
+ debug(1, "Replaced the duplicated plugin: '%s'", plugin->getName());
+ }
+ pl++;
+ }
+ if (!found) {
+ // If it provides a new module, just add it to the list of known plugins.
+ _plugins[plugin->getType()].push_back(plugin);
+ }
+
return true;
} else {
// Failed to load the plugin
@@ -315,15 +346,59 @@
}
}
-GameList PluginManager::detectGames(const FSList &fslist) const {
+
+// Engine plugins
+
+#include "engines/metaengine.h"
+
+DECLARE_SINGLETON(EngineManager);
+
+GameDescriptor EngineManager::findGame(const Common::String &gameName, const EnginePlugin **plugin) const {
+ // Find the GameDescriptor for this target
+ const EnginePlugin::list &plugins = getPlugins();
+ GameDescriptor result;
+
+ if (plugin)
+ *plugin = 0;
+
+ EnginePlugin::list::const_iterator iter = plugins.begin();
+ for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
+ result = (**iter)->findGame(gameName.c_str());
+ if (!result.gameid().empty()) {
+ if (plugin)
+ *plugin = *iter;
+ break;
+ }
+ }
+ return result;
+}
+
+GameList EngineManager::detectGames(const FSList &fslist) const {
GameList candidates;
+ const EnginePlugin::list &plugins = getPlugins();
+
// Iterate over all known games and for each check if it might be
// the game in the presented directory.
- PluginList::const_iterator iter;
- for (iter = _plugins.begin(); iter != _plugins.end(); ++iter) {
- candidates.push_back((*iter)->detectGames(fslist));
+ EnginePlugin::list::const_iterator iter;
+ for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
+ candidates.push_back((**iter)->detectGames(fslist));
}
return candidates;
}
+
+const EnginePlugin::list &EngineManager::getPlugins() const {
+ return (const EnginePlugin::list&)PluginManager::instance().getPlugins(PLUGIN_TYPE_ENGINE);
+}
+
+
+// MIDI plugins
+
+#include "sound/midiplugin.h"
+
+DECLARE_SINGLETON(MidiManager);
+
+const MidiPlugin::list &MidiManager::getPlugins() const {
+ return (const MidiPlugin::list&)PluginManager::instance().getPlugins(PLUGIN_TYPE_MIDI);
+}
Modified: scummvm/branches/gsoc2008-rtl/base/plugins.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/base/plugins.h 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/base/plugins.h 2008-05-14 20:37:18 UTC (rev 32125)
@@ -26,80 +26,57 @@
#ifndef BASE_PLUGINS_H
#define BASE_PLUGINS_H
-#include "common/array.h"
#include "common/error.h"
-#include "common/list.h"
#include "common/singleton.h"
#include "common/util.h"
-#include "base/game.h"
+#ifdef DYNAMIC_MODULES
+#include "common/fs.h"
+#endif
+
/**
- * Abstract base class for the plugin objects which handle plugins
- * instantiation. Subclasses for this may be used for engine plugins
- * and other types of plugins.
+ * @page pagePlugins An overview of the ScummVM plugin system
+ * This is a brief overview of how plugins (dynamically loadable code modules)
+ * work in ScummVM. We will explain how to write plugins, how they work internally,
+ * and sketch how porters can add support for them in their ports.
+ *
+ * \section secPluginImpl Implementing a plugin
+ * TODO
+ *
+ * \section secPluginUse Using plugins
+ * TODO
+ *
+ * \section secPluginInternals How plugins work internally
+ * TODO
+ *
+ * \section secPluginBackend How to add support for dynamic plugins to a port
+ * TODO
*/
-class PluginObject {
-public:
- virtual ~PluginObject() {}
- /** Returns the name of the plugin. */
- virtual const char *getName() const = 0;
-};
-#include "engines/metaengine.h"
-// Global Plugin API version
+// Plugin versioning
+
+/** Global Plugin API version */
#define PLUGIN_VERSION 1
enum PluginType {
PLUGIN_TYPE_ENGINE = 0,
+ PLUGIN_TYPE_MIDI,
PLUGIN_TYPE_MAX
};
// TODO: Make the engine API version depend on ScummVM's version
-// because of the backlinking
+// because of the backlinking (posibly from the SVN revision)
#define PLUGIN_TYPE_ENGINE_VERSION 1
+#define PLUGIN_TYPE_MIDI_VERSION 1
extern int pluginTypeVersions[PLUGIN_TYPE_MAX];
-class Engine;
-class FSList;
-class OSystem;
-/**
- * Abstract base class for the plugin system.
- * Subclasses for this can be used to wrap both static and dynamic
- * plugins.
- */
-class Plugin {
-protected:
- PluginObject *_pluginObject;
- PluginType _type;
+// Plugin linking
-public:
- Plugin() : _pluginObject(0) {}
- virtual ~Plugin() {
- //if (isLoaded())
- //unloadPlugin();
- }
-
-// virtual bool isLoaded() const = 0; // TODO
- virtual bool loadPlugin() = 0; // TODO: Rename to load() ?
- virtual void unloadPlugin() = 0; // TODO: Rename to unload() ?
-
- PluginType getType() const;
- const char *getName() const;
- const char *getCopyright() const;
-
- PluginError createInstance(OSystem *syst, Engine **engine) const;
- GameList getSupportedGames() const;
- GameDescriptor findGame(const char *gameid) const;
- GameList detectGames(const FSList &fslist) const;
- SaveStateList listSaves(const char *target) const;
-};
-
-
#define STATIC_PLUGIN 1
#define DYNAMIC_PLUGIN 2
@@ -116,14 +93,14 @@
(defined(ENABLE_##ID) && (ENABLE_##ID == DYNAMIC_PLUGIN) && defined(DYNAMIC_MODULES))
/**
- * REGISTER_PLUGIN is a convenience macro meant to ease writing
- * the plugin interface for our modules. In particular, using it
- * makes it possible to compile the very same code in a module
- * both as a static and a dynamic plugin.
+ * REGISTER_PLUGIN_STATIC is a convenience macro which is used to declare
+ * the plugin interface for static plugins. Code (such as game engines)
+ * which needs to implement a static plugin can simply invoke this macro
+ * with a plugin ID, plugin type and PluginObject subclass, and the correct
+ * wrapper code will be inserted.
*
- * @todo add some means to query the plugin API version etc.
+ * @see REGISTER_PLUGIN_DYNAMIC
*/
-
#define REGISTER_PLUGIN_STATIC(ID,TYPE,PLUGINCLASS) \
PluginType g_##ID##_type = TYPE; \
PluginObject *g_##ID##_getObject() { \
@@ -133,6 +110,15 @@
#ifdef DYNAMIC_MODULES
+/**
+ * REGISTER_PLUGIN_DYNAMIC is a convenience macro which is used to declare
+ * the plugin interface for dynamically loadable plugins. Code (such as game engines)
+ * which needs to implement a dynamic plugin can simply invoke this macro
+ * with a plugin ID, plugin type and PluginObject subclass, and the correct
+ * wrapper code will be inserted.
+ *
+ * @see REGISTER_PLUGIN_STATIC
+ */
#define REGISTER_PLUGIN_DYNAMIC(ID,TYPE,PLUGINCLASS) \
extern "C" { \
PLUGIN_EXPORT int32 PLUGIN_getVersion() { return PLUGIN_VERSION; } \
@@ -147,44 +133,149 @@
#endif // DYNAMIC_MODULES
-/** List of plugins. */
+// Abstract plugins
+
+/**
+ * Abstract base class for the plugin objects which handle plugins
+ * instantiation. Subclasses for this may be used for engine plugins
+ * and other types of plugins.
+ *
+ * FIXME: This class needs better documentation, esp. how it differs from class Plugin
+ */
+class PluginObject {
+public:
+ virtual ~PluginObject() {}
+
+ /** Returns the name of the plugin. */
+ virtual const char *getName() const = 0;
+};
+
+/**
+ * Abstract base class for the plugin system.
+ * Subclasses for this can be used to wrap both static and dynamic
+ * plugins.
+ *
+ * FIXME: This class needs better documentation, esp. how it differs from class PluginObject
+ */
+class Plugin {
+protected:
+ PluginObject *_pluginObject;
+ PluginType _type;
+
+public:
+ Plugin() : _pluginObject(0) {}
+ virtual ~Plugin() {
+ //if (isLoaded())
+ //unloadPlugin();
+ }
+
+// virtual bool isLoaded() const = 0; // TODO
+ virtual bool loadPlugin() = 0; // TODO: Rename to load() ?
+ virtual void unloadPlugin() = 0; // TODO: Rename to unload() ?
+
+ PluginType getType() const;
+ const char *getName() const;
+};
+
+/** List of Plugin instances. */
typedef Common::Array<Plugin *> PluginList;
+/**
+ * Convenience template to make it easier defining normal Plugin
+ * subclasses. Namely, the PluginSubclass will manage PluginObjects
+ * of a type specified via the PO_t template parameter.
+ */
+template<class PO_t>
+class PluginSubclass : public Plugin {
+public:
+ PO_t *operator->() const {
+ return (PO_t *)_pluginObject;
+ }
+ typedef Common::Array<PluginSubclass *> list;
+};
+
+/**
+ * Abstract base class for Plugin factories. Subclasses of this
+ * are responsible for creating plugin objects, e.g. by loading
+ * loadable modules from storage media; by creating "fake" plugins
+ * from static code; or whatever other means.
+ */
class PluginProvider {
public:
virtual ~PluginProvider() {}
/**
* Return a list of Plugin objects. The caller is responsible for actually
- * loading/unloading them (by invoking the appropriate methods).
+ * loading/unloading them (by invoking the appropriate Plugin methods).
* Furthermore, the caller is responsible for deleting these objects
* eventually.
+ *
+ * @return a list of Plugin instances
*/
virtual PluginList getPlugins() = 0;
};
+#ifdef DYNAMIC_MODULES
+
+/**
+ * Abstract base class for Plugin factories which load binary code from files.
+ * Subclasses only have to implement the createPlugin() method, and optionally
+ * can overload the other protected methods to achieve custom behavior.
+ */
class FilePluginProvider : public PluginProvider {
public:
+ /**
+ * Return a list of Plugin objects loaded via createPlugin from disk.
+ * For this, a list of directories is searched for plugin objects:
+ * The current dir and its "plugins" subdirectory (if present), a list
+ * of custom search dirs (see addCustomDirectories) and finally the
+ * directory specified via the "pluginspath" config variable (if any).
+ *
+ * @return a list of Plugin instances
+ */
virtual PluginList getPlugins();
protected:
+ /**
+ * Create a Plugin instance from a loadable code module with the specified name.
+ * Subclasses of FilePluginProvider have to at least overload this method.
+ * If the file is not found, or does not contain loadable code, 0 is returned instead.
+ *
+ * @param filename the name of the loadable code module
+ * @return a pointer to a Plugin instance, or 0 if an error occurred.
+ */
virtual Plugin* createPlugin(const Common::String &filename) const = 0;
- virtual const char* getPrefix() const;
- virtual const char* getSuffix() const;
+ /**
+ * Check if the supplied filename corresponds to a loadable plugin file in
+ * the current platform.
+ *
+ * @param filename the name of the file to check
+ * @return true if the filename corresponds to a plugin, false otherwise
+ */
+ virtual bool isPluginFilename(const Common::String &filename) const;
- virtual void addCustomDirectories(Common::StringList &dirs) const;
+ /**
+ * Optionally add to the list of directories to be searched for
+ * plugins by getPlugins().
+ *
+ * @param dirs the reference to the list of directories to be used when
+ * searching for plugins.
+ */
+ virtual void addCustomDirectories(FSList &dirs) const;
};
+#endif // DYNAMIC_MODULES
+
/**
- * Instances of this class manage all plugins, including loading them,
- * making wrapper objects of class Plugin available, and unloading them.
+ * Singleton class which manages all plugins, including loading them,
+ * managing all Plugin class instances, and unloading them.
*/
class PluginManager : public Common::Singleton<PluginManager> {
- typedef Common::List<PluginProvider *> ProviderList;
+ typedef Common::Array<PluginProvider *> ProviderList;
private:
- PluginList _plugins;
+ PluginList _plugins[PLUGIN_TYPE_MAX];
ProviderList _providers;
bool tryLoadPlugin(Plugin *plugin);
@@ -199,11 +290,9 @@
void loadPlugins();
void unloadPlugins();
- void unloadPluginsExcept(const Plugin *plugin);
+ void unloadPluginsExcept(PluginType type, const Plugin *plugin);
- const PluginList &getPlugins() { return _plugins; }
-
- GameList detectGames(const FSList &fslist) const;
+ const PluginList &getPlugins(PluginType t) { return _plugins[t]; }
};
#endif
Modified: scummvm/branches/gsoc2008-rtl/configure
===================================================================
--- scummvm/branches/gsoc2008-rtl/configure 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/configure 2008-05-14 20:37:18 UTC (rev 32125)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# configue -- custom configure script for ScummVM.
+# configure -- custom configure script for ScummVM.
#
# ScummVM is the legal property of its developers, whose names
# are too numerous to list here. Please refer to the COPYRIGHT
Modified: scummvm/branches/gsoc2008-rtl/dists/engine-data/kyra.dat
===================================================================
(Binary files differ)
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc7/gob.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc7/gob.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc7/gob.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -325,6 +325,9 @@
RelativePath="..\..\engines\gob\saveload_v3.cpp">
</File>
<File
+ RelativePath="..\..\engines\gob\saveload_v4.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\gob\scenery.cpp">
</File>
<File
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc7/kyra.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc7/kyra.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc7/kyra.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -100,13 +100,13 @@
RelativePath="..\..\engines\kyra\animator_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\animator_mr.cpp">
+ RelativePath="..\..\engines\kyra\animator_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v1.cpp">
+ RelativePath="..\..\engines\kyra\animator_lok.h">
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v1.h">
+ RelativePath="..\..\engines\kyra\animator_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\animator_v2.cpp">
@@ -133,16 +133,16 @@
RelativePath="..\..\engines\kyra\gui_hof.h">
</File>
<File
- RelativePath="..\..\engines\kyra\gui_mr.cpp">
+ RelativePath="..\..\engines\kyra\gui_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\gui_mr.h">
+ RelativePath="..\..\engines\kyra\gui_lok.h">
</File>
<File
- RelativePath="..\..\engines\kyra\gui_v1.cpp">
+ RelativePath="..\..\engines\kyra\gui_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\gui_v1.h">
+ RelativePath="..\..\engines\kyra\gui_mr.h">
</File>
<File
RelativePath="..\..\engines\kyra\gui_v2.cpp">
@@ -154,25 +154,25 @@
RelativePath="..\..\engines\kyra\items_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\items_mr.cpp">
+ RelativePath="..\..\engines\kyra\items_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\items_v1.cpp">
+ RelativePath="..\..\engines\kyra\items_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\items_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra.cpp">
+ RelativePath="..\..\engines\kyra\kyra_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra.h">
+ RelativePath="..\..\engines\kyra\kyra_hof.h">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_hof.cpp">
+ RelativePath="..\..\engines\kyra\kyra_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_hof.h">
+ RelativePath="..\..\engines\kyra\kyra_lok.h">
</File>
<File
RelativePath="..\..\engines\kyra\kyra_mr.cpp">
@@ -205,16 +205,16 @@
RelativePath="..\..\engines\kyra\saveload_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_mr.cpp">
+ RelativePath="..\..\engines\kyra\saveload_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v1.cpp">
+ RelativePath="..\..\engines\kyra\saveload_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp">
+ RelativePath="..\..\engines\kyra\scene_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene_hof.cpp">
+ RelativePath="..\..\engines\kyra\scene_lok.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\scene_mr.cpp">
@@ -238,16 +238,16 @@
RelativePath="..\..\engines\kyra\screen_hof.h">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_mr.cpp">
+ RelativePath="..\..\engines\kyra\screen_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_mr.h">
+ RelativePath="..\..\engines\kyra\screen_lok.h">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v1.cpp">
+ RelativePath="..\..\engines\kyra\screen_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v1.h">
+ RelativePath="..\..\engines\kyra\screen_mr.h">
</File>
<File
RelativePath="..\..\engines\kyra\screen_v2.cpp">
@@ -265,6 +265,9 @@
RelativePath="..\..\engines\kyra\script_hof.cpp">
</File>
<File
+ RelativePath="..\..\engines\kyra\script_lok.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\script_mr.cpp">
</File>
<File
@@ -289,10 +292,10 @@
RelativePath="..\..\engines\kyra\sequences_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_mr.cpp">
+ RelativePath="..\..\engines\kyra\sequences_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v1.cpp">
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\sequences_v2.cpp">
@@ -310,10 +313,10 @@
RelativePath="..\..\engines\kyra\sound_digital.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sound_towns.cpp">
+ RelativePath="..\..\engines\kyra\sound_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sound_v1.cpp">
+ RelativePath="..\..\engines\kyra\sound_towns.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\sprites.cpp">
@@ -337,15 +340,15 @@
RelativePath="..\..\engines\kyra\text_hof.h">
</File>
<File
+ RelativePath="..\..\engines\kyra\text_lok.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\text_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\text_mr.h">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v1.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\timer.cpp">
</File>
<File
@@ -355,10 +358,10 @@
RelativePath="..\..\engines\kyra\timer_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\timer_mr.cpp">
+ RelativePath="..\..\engines\kyra\timer_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v1.cpp">
+ RelativePath="..\..\engines\kyra\timer_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\vqa.cpp">
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc7/made.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc7/made.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc7/made.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.00"
@@ -148,22 +148,22 @@
RelativePath="..\..\engines\made\screen.h">
</File>
<File
- RelativePath="..\..\engines\made\script.cpp">
+ RelativePath="..\..\engines\made\screenfx.cpp">
</File>
<File
- RelativePath="..\..\engines\made\script.h">
+ RelativePath="..\..\engines\made\screenfx.h">
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs.h">
+ RelativePath="..\..\engines\made\script.cpp">
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_lgop2.cpp">
+ RelativePath="..\..\engines\made\script.h">
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_mhne.cpp">
+ RelativePath="..\..\engines\made\scriptfuncs.cpp">
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_rtz.cpp">
+ RelativePath="..\..\engines\made\scriptfuncs.h">
</File>
<File
RelativePath="..\..\engines\made\sound.cpp">
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc7/parallaction.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc7/parallaction.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc7/parallaction.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -148,6 +148,12 @@
RelativePath="..\..\engines\parallaction\gui_ns.cpp">
</File>
<File
+ RelativePath="..\..\engines\parallaction\input.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\parallaction\input.h">
+ </File>
+ <File
RelativePath="..\..\engines\parallaction\inventory.cpp">
</File>
<File
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc7/scummvm.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc7/scummvm.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc7/scummvm.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -386,6 +386,9 @@
RelativePath="..\..\sound\midiparser_xmidi.cpp">
</File>
<File
+ RelativePath="..\..\sound\midiplugin.h">
+ </File>
+ <File
RelativePath="..\..\sound\mixer.cpp">
</File>
<File
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc71/gob.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc71/gob.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc71/gob.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -339,6 +339,9 @@
RelativePath="..\..\engines\gob\saveload_v3.cpp">
</File>
<File
+ RelativePath="..\..\engines\gob\saveload_v4.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\gob\scenery.cpp">
</File>
<File
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc71/kyra.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc71/kyra.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc71/kyra.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -114,13 +114,13 @@
RelativePath="..\..\engines\kyra\animator_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\animator_mr.cpp">
+ RelativePath="..\..\engines\kyra\animator_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v1.cpp">
+ RelativePath="..\..\engines\kyra\animator_lok.h">
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v1.h">
+ RelativePath="..\..\engines\kyra\animator_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\animator_v2.cpp">
@@ -147,16 +147,16 @@
RelativePath="..\..\engines\kyra\gui_hof.h">
</File>
<File
- RelativePath="..\..\engines\kyra\gui_mr.cpp">
+ RelativePath="..\..\engines\kyra\gui_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\gui_mr.h">
+ RelativePath="..\..\engines\kyra\gui_lok.h">
</File>
<File
- RelativePath="..\..\engines\kyra\gui_v1.cpp">
+ RelativePath="..\..\engines\kyra\gui_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\gui_v1.h">
+ RelativePath="..\..\engines\kyra\gui_mr.h">
</File>
<File
RelativePath="..\..\engines\kyra\gui_v2.cpp">
@@ -168,25 +168,25 @@
RelativePath="..\..\engines\kyra\items_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\items_mr.cpp">
+ RelativePath="..\..\engines\kyra\items_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\items_v1.cpp">
+ RelativePath="..\..\engines\kyra\items_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\items_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra.cpp">
+ RelativePath="..\..\engines\kyra\kyra_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra.h">
+ RelativePath="..\..\engines\kyra\kyra_hof.h">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_hof.cpp">
+ RelativePath="..\..\engines\kyra\kyra_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_hof.h">
+ RelativePath="..\..\engines\kyra\kyra_lok.h">
</File>
<File
RelativePath="..\..\engines\kyra\kyra_mr.cpp">
@@ -219,16 +219,16 @@
RelativePath="..\..\engines\kyra\saveload_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_mr.cpp">
+ RelativePath="..\..\engines\kyra\saveload_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v1.cpp">
+ RelativePath="..\..\engines\kyra\saveload_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp">
+ RelativePath="..\..\engines\kyra\scene_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene_hof.cpp">
+ RelativePath="..\..\engines\kyra\scene_lok.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\scene_mr.cpp">
@@ -252,16 +252,16 @@
RelativePath="..\..\engines\kyra\screen_hof.h">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_mr.cpp">
+ RelativePath="..\..\engines\kyra\screen_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_mr.h">
+ RelativePath="..\..\engines\kyra\screen_lok.h">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v1.cpp">
+ RelativePath="..\..\engines\kyra\screen_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v1.h">
+ RelativePath="..\..\engines\kyra\screen_mr.h">
</File>
<File
RelativePath="..\..\engines\kyra\screen_v2.cpp">
@@ -279,6 +279,9 @@
RelativePath="..\..\engines\kyra\script_hof.cpp">
</File>
<File
+ RelativePath="..\..\engines\kyra\script_lok.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\script_mr.cpp">
</File>
<File
@@ -303,10 +306,10 @@
RelativePath="..\..\engines\kyra\sequences_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_mr.cpp">
+ RelativePath="..\..\engines\kyra\sequences_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v1.cpp">
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\sequences_v2.cpp">
@@ -324,10 +327,10 @@
RelativePath="..\..\engines\kyra\sound_digital.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sound_towns.cpp">
+ RelativePath="..\..\engines\kyra\sound_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sound_v1.cpp">
+ RelativePath="..\..\engines\kyra\sound_towns.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\sprites.cpp">
@@ -351,15 +354,15 @@
RelativePath="..\..\engines\kyra\text_hof.h">
</File>
<File
+ RelativePath="..\..\engines\kyra\text_lok.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\text_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\text_mr.h">
</File>
<File
- RelativePath="..\..\engines\kyra\text_v1.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\timer.cpp">
</File>
<File
@@ -369,10 +372,10 @@
RelativePath="..\..\engines\kyra\timer_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\timer_mr.cpp">
+ RelativePath="..\..\engines\kyra\timer_lok.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v1.cpp">
+ RelativePath="..\..\engines\kyra\timer_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\vqa.cpp">
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc71/made.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc71/made.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc71/made.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
@@ -162,22 +162,22 @@
RelativePath="..\..\engines\made\screen.h">
</File>
<File
- RelativePath="..\..\engines\made\script.cpp">
+ RelativePath="..\..\engines\made\screenfx.cpp">
</File>
<File
- RelativePath="..\..\engines\made\script.h">
+ RelativePath="..\..\engines\made\screenfx.h">
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs.h">
+ RelativePath="..\..\engines\made\script.cpp">
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_lgop2.cpp">
+ RelativePath="..\..\engines\made\script.h">
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_mhne.cpp">
+ RelativePath="..\..\engines\made\scriptfuncs.cpp">
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_rtz.cpp">
+ RelativePath="..\..\engines\made\scriptfuncs.h">
</File>
<File
RelativePath="..\..\engines\made\sound.cpp">
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc71/parallaction.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc71/parallaction.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc71/parallaction.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -162,6 +162,12 @@
RelativePath="..\..\engines\parallaction\gui_ns.cpp">
</File>
<File
+ RelativePath="..\..\engines\parallaction\input.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\parallaction\input.h">
+ </File>
+ <File
RelativePath="..\..\engines\parallaction\inventory.cpp">
</File>
<File
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc71/scummvm.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc71/scummvm.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc71/scummvm.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -400,6 +400,9 @@
RelativePath="..\..\sound\midiparser_xmidi.cpp">
</File>
<File
+ RelativePath="..\..\sound\midiplugin.h">
+ </File>
+ <File
RelativePath="..\..\sound\mixer.cpp">
</File>
<File
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc8/gob.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc8/gob.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc8/gob.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -465,6 +465,10 @@
>
</File>
<File
+ RelativePath="..\..\engines\gob\saveload_v4.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\gob\scenery.cpp"
>
</File>
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc8/kyra.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc8/kyra.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc8/kyra.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -165,15 +165,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\animator_mr.cpp"
+ RelativePath="..\..\engines\kyra\animator_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v1.cpp"
+ RelativePath="..\..\engines\kyra\animator_lok.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v1.h"
+ RelativePath="..\..\engines\kyra\animator_mr.cpp"
>
</File>
<File
@@ -209,19 +209,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\gui_mr.cpp"
+ RelativePath="..\..\engines\kyra\gui_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\gui_mr.h"
+ RelativePath="..\..\engines\kyra\gui_lok.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\gui_v1.cpp"
+ RelativePath="..\..\engines\kyra\gui_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\gui_v1.h"
+ RelativePath="..\..\engines\kyra\gui_mr.h"
>
</File>
<File
@@ -237,11 +237,11 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_mr.cpp"
+ RelativePath="..\..\engines\kyra\items_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v1.cpp"
+ RelativePath="..\..\engines\kyra\items_mr.cpp"
>
</File>
<File
@@ -249,19 +249,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra.cpp"
+ RelativePath="..\..\engines\kyra\kyra_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra.h"
+ RelativePath="..\..\engines\kyra\kyra_hof.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_hof.cpp"
+ RelativePath="..\..\engines\kyra\kyra_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_hof.h"
+ RelativePath="..\..\engines\kyra\kyra_lok.h"
>
</File>
<File
@@ -305,19 +305,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_mr.cpp"
+ RelativePath="..\..\engines\kyra\saveload_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v1.cpp"
+ RelativePath="..\..\engines\kyra\saveload_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp"
+ RelativePath="..\..\engines\kyra\scene_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene_hof.cpp"
+ RelativePath="..\..\engines\kyra\scene_lok.cpp"
>
</File>
<File
@@ -349,19 +349,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_mr.cpp"
+ RelativePath="..\..\engines\kyra\screen_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_mr.h"
+ RelativePath="..\..\engines\kyra\screen_lok.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v1.cpp"
+ RelativePath="..\..\engines\kyra\screen_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v1.h"
+ RelativePath="..\..\engines\kyra\screen_mr.h"
>
</File>
<File
@@ -385,6 +385,10 @@
>
</File>
<File
+ RelativePath="..\..\engines\kyra\script_lok.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\kyra\script_mr.cpp"
>
</File>
@@ -417,11 +421,11 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_mr.cpp"
+ RelativePath="..\..\engines\kyra\sequences_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v1.cpp"
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp"
>
</File>
<File
@@ -445,11 +449,11 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\sound_towns.cpp"
+ RelativePath="..\..\engines\kyra\sound_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\sound_v1.cpp"
+ RelativePath="..\..\engines\kyra\sound_towns.cpp"
>
</File>
<File
@@ -481,15 +485,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_mr.cpp"
+ RelativePath="..\..\engines\kyra\text_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_mr.h"
+ RelativePath="..\..\engines\kyra\text_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v1.cpp"
+ RelativePath="..\..\engines\kyra\text_mr.h"
>
</File>
<File
@@ -505,11 +509,11 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\timer_mr.cpp"
+ RelativePath="..\..\engines\kyra\timer_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v1.cpp"
+ RelativePath="..\..\engines\kyra\timer_mr.cpp"
>
</File>
<File
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc8/made.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc8/made.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc8/made.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
@@ -229,27 +229,27 @@
>
</File>
<File
- RelativePath="..\..\engines\made\script.cpp"
+ RelativePath="..\..\engines\made\screenfx.cpp"
>
</File>
<File
- RelativePath="..\..\engines\made\script.h"
+ RelativePath="..\..\engines\made\screenfx.h"
>
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs.h"
+ RelativePath="..\..\engines\made\script.cpp"
>
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_lgop2.cpp"
+ RelativePath="..\..\engines\made\script.h"
>
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_mhne.cpp"
+ RelativePath="..\..\engines\made\scriptfuncs.cpp"
>
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_rtz.cpp"
+ RelativePath="..\..\engines\made\scriptfuncs.h"
>
</File>
<File
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc8/parallaction.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc8/parallaction.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc8/parallaction.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -229,6 +229,14 @@
>
</File>
<File
+ RelativePath="..\..\engines\parallaction\input.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\parallaction\input.h"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\parallaction\inventory.cpp"
>
</File>
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc8/scummvm.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc8/scummvm.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc8/scummvm.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -551,6 +551,10 @@
>
</File>
<File
+ RelativePath="..\..\sound\midiplugin.h"
+ >
+ </File>
+ <File
RelativePath="..\..\sound\mixer.cpp"
>
</File>
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc8_to_msvc7_71.bat
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc8_to_msvc7_71.bat 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc8_to_msvc7_71.bat 2008-05-14 20:37:18 UTC (rev 32125)
@@ -101,3 +101,4 @@
echo this batch file resides
:the_end
+pause
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc9/gob.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc9/gob.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc9/gob.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -466,6 +466,10 @@
>
</File>
<File
+ RelativePath="..\..\engines\gob\saveload_v4.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\gob\scenery.cpp"
>
</File>
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc9/kyra.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc9/kyra.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc9/kyra.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -166,15 +166,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\animator_mr.cpp"
+ RelativePath="..\..\engines\kyra\animator_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v1.cpp"
+ RelativePath="..\..\engines\kyra\animator_lok.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v1.h"
+ RelativePath="..\..\engines\kyra\animator_mr.cpp"
>
</File>
<File
@@ -210,19 +210,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\gui_mr.cpp"
+ RelativePath="..\..\engines\kyra\gui_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\gui_mr.h"
+ RelativePath="..\..\engines\kyra\gui_lok.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\gui_v1.cpp"
+ RelativePath="..\..\engines\kyra\gui_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\gui_v1.h"
+ RelativePath="..\..\engines\kyra\gui_mr.h"
>
</File>
<File
@@ -238,11 +238,11 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_mr.cpp"
+ RelativePath="..\..\engines\kyra\items_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v1.cpp"
+ RelativePath="..\..\engines\kyra\items_mr.cpp"
>
</File>
<File
@@ -250,19 +250,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra.cpp"
+ RelativePath="..\..\engines\kyra\kyra_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra.h"
+ RelativePath="..\..\engines\kyra\kyra_hof.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_hof.cpp"
+ RelativePath="..\..\engines\kyra\kyra_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\kyra_hof.h"
+ RelativePath="..\..\engines\kyra\kyra_lok.h"
>
</File>
<File
@@ -306,19 +306,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_mr.cpp"
+ RelativePath="..\..\engines\kyra\saveload_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v1.cpp"
+ RelativePath="..\..\engines\kyra\saveload_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp"
+ RelativePath="..\..\engines\kyra\scene_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene_hof.cpp"
+ RelativePath="..\..\engines\kyra\scene_lok.cpp"
>
</File>
<File
@@ -350,19 +350,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_mr.cpp"
+ RelativePath="..\..\engines\kyra\screen_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_mr.h"
+ RelativePath="..\..\engines\kyra\screen_lok.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v1.cpp"
+ RelativePath="..\..\engines\kyra\screen_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen_v1.h"
+ RelativePath="..\..\engines\kyra\screen_mr.h"
>
</File>
<File
@@ -386,6 +386,10 @@
>
</File>
<File
+ RelativePath="..\..\engines\kyra\script_lok.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\kyra\script_mr.cpp"
>
</File>
@@ -418,11 +422,11 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_mr.cpp"
+ RelativePath="..\..\engines\kyra\sequences_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v1.cpp"
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp"
>
</File>
<File
@@ -446,11 +450,11 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\sound_towns.cpp"
+ RelativePath="..\..\engines\kyra\sound_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\sound_v1.cpp"
+ RelativePath="..\..\engines\kyra\sound_towns.cpp"
>
</File>
<File
@@ -482,15 +486,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_mr.cpp"
+ RelativePath="..\..\engines\kyra\text_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_mr.h"
+ RelativePath="..\..\engines\kyra\text_mr.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\text_v1.cpp"
+ RelativePath="..\..\engines\kyra\text_mr.h"
>
</File>
<File
@@ -506,11 +510,11 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\timer_mr.cpp"
+ RelativePath="..\..\engines\kyra\timer_lok.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\timer_v1.cpp"
+ RelativePath="..\..\engines\kyra\timer_mr.cpp"
>
</File>
<File
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc9/made.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc9/made.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc9/made.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
@@ -230,27 +230,27 @@
>
</File>
<File
- RelativePath="..\..\engines\made\script.cpp"
+ RelativePath="..\..\engines\made\screenfx.cpp"
>
</File>
<File
- RelativePath="..\..\engines\made\script.h"
+ RelativePath="..\..\engines\made\screenfx.h"
>
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs.h"
+ RelativePath="..\..\engines\made\script.cpp"
>
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_lgop2.cpp"
+ RelativePath="..\..\engines\made\script.h"
>
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_mhne.cpp"
+ RelativePath="..\..\engines\made\scriptfuncs.cpp"
>
</File>
<File
- RelativePath="..\..\engines\made\scriptfuncs_rtz.cpp"
+ RelativePath="..\..\engines\made\scriptfuncs.h"
>
</File>
<File
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc9/parallaction.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc9/parallaction.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc9/parallaction.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -230,6 +230,14 @@
>
</File>
<File
+ RelativePath="..\..\engines\parallaction\input.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\parallaction\input.h"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\parallaction\inventory.cpp"
>
</File>
Modified: scummvm/branches/gsoc2008-rtl/dists/msvc9/scummvm.vcproj
===================================================================
--- scummvm/branches/gsoc2008-rtl/dists/msvc9/scummvm.vcproj 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/dists/msvc9/scummvm.vcproj 2008-05-14 20:37:18 UTC (rev 32125)
@@ -556,6 +556,10 @@
>
</File>
<File
+ RelativePath="..\..\sound\midiplugin.h"
+ >
+ </File>
+ <File
RelativePath="..\..\sound\mixer.cpp"
>
</File>
Modified: scummvm/branches/gsoc2008-rtl/engines/cine/anim.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/cine/anim.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/engines/cine/anim.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -380,8 +380,8 @@
fHandle.writeUint16BE(_var1);
fHandle.writeUint16BE(_bpp);
fHandle.writeUint16BE(_height);
- fHandle.writeUint32BE(0); // _data
- fHandle.writeUint32BE(0); // _mask
+ fHandle.writeUint32BE(_data != NULL); // _data
+ fHandle.writeUint32BE(_mask != NULL); // _mask
fHandle.writeUint16BE(_fileIdx);
fHandle.writeUint16BE(_frameIdx);
fHandle.write(_name, sizeof(_name));
Modified: scummvm/branches/gsoc2008-rtl/engines/drascula/animation.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/drascula/animation.cpp 2008-05-14 20:24:22 UTC (rev 32124)
+++ scummvm/branches/gsoc2008-rtl/engines/drascula/animation.cpp 2008-05-14 20:37:18 UTC (rev 32125)
@@ -35,7 +35,7 @@
int pos_pixel[6];
while (term_int == 0) {
- playmusic(29);
+ playMusic(29);
fliplay("logoddm.bin", 9);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
@@ -46,7 +46,7 @@
delay(340);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- playmusic(26);
+ playMusic(26);
delay(500);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
@@ -56,7 +56,7 @@
clearRoom();
loadPic("cielo.alg");
decompressPic(dir_zona_pantalla, 256);
- Negro();
+ black();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
FundeDelNegro(2);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
@@ -64,7 +64,7 @@
delay(900);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- color_abc(ROJO);
+ color_abc(RED);
centra_texto("Transilvanya, 1993 d.c.", 160, 100);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
@@ -102,15 +102,15 @@
clearRoom();
loadPic("96.alg");
- decompressPic(dir_hare_frente, COMPLETA);
+ decompressPic(dir_hare_frente, COMPLETE_PAL);
loadPic("103.alg");
- decompressPic(dir_dibujo1, MEDIA);
+ decompressPic(dir_dibujo1, HALF_PAL);
loadPic("104.alg");
decompressPic(dir_dibujo3, 1);
loadPic("aux104.alg");
decompressPic(dir_dibujo2, 1);
- playmusic(4);
+ playMusic(4);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
delay(400);
@@ -169,7 +169,7 @@
clearRoom();
loadPic("100.alg");
- decompressPic(dir_dibujo1, MEDIA);
+ decompressPic(dir_dibujo1, HALF_PAL);
loadPic("auxigor.alg");
decompressPic(dir_hare_frente, 1);
loadPic("auxdr.alg");
@@ -205,16 +205,16 @@
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
- color_solo = ROJO;
+ color_solo = RED;
loadPic("plan1.alg");
- decompressPic(dir_zona_pantalla, MEDIA);
+ decompressPic(dir_zona_pantalla, HALF_PAL);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(10);
talk_solo(_textd[_lang][4],"d4.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
loadPic("plan1.alg");
- decompressPic(dir_zona_pantalla, MEDIA);
+ decompressPic(dir_zona_pantalla, HALF_PAL);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk_solo(_textd[_lang][5], "d5.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
@@ -224,7 +224,7 @@
break;
clearRoom();
loadPic("plan2.alg");
- decompressPic(dir_zona_pantalla, MEDIA);
+ decompressPic(dir_zona_pantalla, HALF_PAL);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(20);
talk_solo(_textd[_lang][6], "d6.als");
@@ -235,7 +235,7 @@
break;
clearRoom();
loadPic("plan3.alg");
- decompressPic(dir_zona_pantalla, MEDIA);
+ decompressPic(dir_zona_pantalla, HALF_PAL);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(20);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
@@ -244,16 +244,16 @@
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
loadPic("plan3.alg");
- decompressPic(dir_zona_pantalla, MEDIA);
+ decompressPic(dir_zona_pantalla, HALF_PAL);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk_solo(_textd[_lang][8], "d8.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
loadPic("100.alg");
- decompressPic(dir_dibujo1, MEDIA);
+ decompressPic(dir_dibujo1, HALF_PAL);
MusicFadeout();
- stopmusic();
+ stopMusic();
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
talk_igor_dch(_texti[_lang][9], "I9.als");
@@ -265,7 +265,7 @@
talk_igor_dch(_texti[_lang][10], "I10.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- playmusic(11);
+ playMusic(11);
talk_dr_izq(_textd[_lang][10], "d10.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
@@ -287,8 +287,8 @@
break;
fin_sound_corte();
clearRoom();
- Negro();
- playmusic(23);
+ black();
+ playMusic(23);
FundeDelNegro(0);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
@@ -375,19 +375,19 @@
break;
clearRoom();
- playmusic(2);
+ playMusic(2);
pause(5);
fliplay("intro.bin", 12);
term_int = 1;
}
clearRoom();
loadPic("96.alg");
- decompressPic(dir_hare_frente, COMPLETA);
+ decompressPic(dir_hare_frente, COMPLETE_PAL);
loadPic("99.alg");
decompressPic(dir_hare_fondo, 1);
}
-void DrasculaEngine::talk_dr_grande(const char *dicho, const char *filename) {
+void DrasculaEngine::talk_dr_grande(const char *said, const char *filename) {
int tiempou;
long tiempol;
int x_talk[4] = {47, 93, 139, 185};
@@ -395,16 +395,14 @@
int l = 0;
int longitud;
- longitud = strlen(dicho);
+ longitud = strlen(said);
tiempol = _system->getMillis();
tiempou = (unsigned int)tiempol / 2;
_rnd->setSeed(tiempou);
- buffer_teclado();
+ color_abc(RED);
- color_abc(ROJO);
-
if (hay_sb == 1) {
sku = new Common::File;
sku->open(filename);
@@ -426,8 +424,8 @@
if (l == 7)
l = 0;
- if (con_voces == 0)
- centra_texto(dicho, 191, 69);
+ if (withVoices == 0)
+ centra_texto(said, 191, 69);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
@@ -439,7 +437,6 @@
if (key != 0)
ctvd_stop();
- buffer_teclado();
if (hay_sb == 1) {
if (LookForFree() != 0)
goto bucless;
@@ -491,10 +488,10 @@
break;
clearRoom();
- stopmusic();
+ stopMusic();
corta_musica = 1;
memset(dir_zona_pantalla, 0, 64000);
- color_solo = BLANCO;
+ color_solo = WHITE;
pause(80);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
@@ -504,22 +501,22 @@
break;
clearRoom();
loadPic("bj.alg");
- decompressPic(dir_zona_pantalla, MEDIA);
+ decompressPic(dir_zona_pantalla, HALF_PAL);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- Negro();
+ black();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
FundeDelNegro(1);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- color_solo = AMARILLO;
+ color_solo = YELLOW;
talk_solo(_text[_lang][214], "214.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
loadPic("16.alg");
- decompressPic(dir_dibujo1, MEDIA);
+ decompressPic(dir_dibujo1, HALF_PAL);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
loadPic("auxbj.alg");
@@ -578,7 +575,7 @@
talk(_text[_lang][222], "222.als");
anima("gaf.bin", 15);
anima("bjb.bin", 14);
- playmusic(9);
+ playMusic(9);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
loadPic("97.alg");
@@ -597,7 +594,7 @@
talk_solo(_text[_lang][223], "223.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- color_solo = BLANCO;
+ color_solo = WHITE;
updateRoom();
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
@@ -627,7 +624,7 @@
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
anima("bes.bin", 16);
- playmusic(11);
+ playMusic(11);
anima("rap.bin", 16);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
@@ -711,7 +708,7 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(3);
- stopmusic();
+ stopMusic();
flags[11] = 1;
talk_pianista(_textp[_lang][1], "p1.als");
@@ -826,7 +823,7 @@
}
void DrasculaEngine::animation_4_2() {
- stopmusic();
+ stopMusic();
flags[9] = 1;
pause(12);
@@ -835,7 +832,7 @@
clearRoom();
loadPic("ciego1.alg");
- decompressPic(dir_dibujo1, MEDIA);
+ decompressPic(dir_dibujo1, HALF_PAL);
loadPic("ciego2.alg");
decompressPic(dir_dibujo3, 1);
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list