added DSPlugin and DS Plugin Provider (steps towards using subtypes of DLObject)

svn-id: r51777

6 files changed, 103 insertions, 4 deletions

diff --git a/backends/module.mk b/backends/module.mk
index 748b786eb4..bcfcb53a3e 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -32,6 +32,7 @@ MODULE_OBJS := \
 	midi/windows.o \
 	plugins/elf-provider.o \
 	plugins/dc/dc-provider.o \
+	plugins/ds/ds-provider.o \
 	plugins/posix/posix-provider.o \
 	plugins/sdl/sdl-provider.o \
 	plugins/win32/win32-provider.o \
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index adcf24f5ff..e68624679f 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -238,7 +238,7 @@ CXXFLAGS=	$(CFLAGS) -Wno-non-virtual-dtor -Wno-unknown-pragmas -Wno-reorder  \
 
 
 ASFLAGS = -mcpu=arm9tdmi -mthumb-interwork
-DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DELF_LOADER_TARGET -DNEW_PLUGIN_DESIGN_FIRST_REFINEMENT -DARM
+DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DELF_LOADER_TARGET -DARM#-DNEW_PLUGIN_DESIGN_FIRST_REFINEMENT
 ifdef USE_MAD
 	DEFINES += -DUSE_MAD
 endif
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 4e44e9f1dd..ee9e4d7622 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -112,6 +112,7 @@
 
 
 #include "backends/plugins/elf-provider.h"
+#include "backends/plugins/ds/ds-provider.h"
 
 #include "backends/fs/ds/ds-fs.h"
 #include "base/version.h"
@@ -3304,7 +3305,7 @@ int main(void) {
 #endif
 
 #ifdef DYNAMIC_MODULES
-	PluginManager::instance().addPluginProvider(new ELFPluginProvider());
+	PluginManager::instance().addPluginProvider(new DSPluginProvider());
 #endif
 
 	while (1) {
diff --git a/backends/plugins/ds/ds-provider.cpp b/backends/plugins/ds/ds-provider.cpp
new file mode 100644
index 0000000000..e4ffb7bd43
--- /dev/null
+++ b/backends/plugins/ds/ds-provider.cpp
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+/*#include "base/plugins.h"
+#include "backends/plugins/dynamic-plugin.h"
+#include "common/fs.h"
+
+#include "backends/plugins/elf-loader.h"*/
+#include "backends/plugins/elf-provider.h"
+#include "backends/plugins/ds/ds-provider.h"
+
+#if defined(DYNAMIC_MODULES) && defined(__DS__)
+
+class DSPlugin : public ELFPlugin {
+public:
+	DSPlugin(const Common::String &filename) {
+		_dlHandle = 0;
+		_filename = filename;
+	}
+
+	~DSPlugin() {
+		if (_dlHandle)
+			unloadPlugin();
+	}
+
+};
+
+/*bool DSPlugin::loadPlugin() {
+
+};*/
+
+Plugin* DSPluginProvider::createPlugin(const Common::FSNode &node) const {
+	return new DSPlugin(node.getPath());
+}
+
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
+
diff --git a/backends/plugins/ds/ds-provider.h b/backends/plugins/ds/ds-provider.h
new file mode 100644
index 0000000000..d9b1ee9cf4
--- /dev/null
+++ b/backends/plugins/ds/ds-provider.h
@@ -0,0 +1,35 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "backends/plugins/elf-provider.h"
+
+#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
+
+class DSPluginProvider : public ELFPluginProvider {
+	Plugin* createPlugin(const Common::FSNode &node) const;
+};
+
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
+
diff --git a/backends/plugins/elf-provider.h b/backends/plugins/elf-provider.h
index 3ed4816c19..2e659df80c 100644
--- a/backends/plugins/elf-provider.h
+++ b/backends/plugins/elf-provider.h
@@ -42,6 +42,9 @@ protected:
 	virtual VoidFunc findSymbol(const char *symbol);
 
 public:
+	ELFPlugin() {
+	}
+
 	ELFPlugin(const Common::String &filename)
 		: _dlHandle(0), _filename(filename) {}
 
@@ -51,13 +54,13 @@ public:
 	}
 
 	bool loadPlugin();
-	void unloadPlugin();
+	virtual void unloadPlugin();
 
 };
 
 class ELFPluginProvider : public FilePluginProvider {
 protected:
-	Plugin* createPlugin(const Common::FSNode &node) const;
+	virtual Plugin* createPlugin(const Common::FSNode &node) const;
 
 	bool isPluginFilename(const Common::FSNode &node) const;