[Scummvm-cvs-logs] SF.net SVN: scummvm:[51778] scummvm/branches/gsoc2010-plugins/backends/ plugins

[toneman1138 at users.sourceforge.net]

Revision: 51778
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51778&view=rev
Author:   toneman1138
Date:     2010-08-06 06:54:44 +0000 (Fri, 06 Aug 2010)

Log Message:
-----------
added loadPlugin function into DSPlugin (doesn't use a DSDLObject yet)

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.cpp
    scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.cpp	2010-08-06 06:03:34 UTC (rev 51777)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.cpp	2010-08-06 06:54:44 UTC (rev 51778)
@@ -45,12 +45,33 @@
 			unloadPlugin();
 	}
 
+	bool loadPlugin();
 };
 
-/*bool DSPlugin::loadPlugin() {
+bool DSPlugin::loadPlugin() {
+		assert(!_dlHandle);
+		DLObject *obj = new DLObject(NULL);
+		if (obj->open(_filename.c_str())) {
+			_dlHandle = obj;
+		} else {
+			delete obj;
+			_dlHandle = NULL;
+		}
 
-};*/
+		if (!_dlHandle) {
+			warning("Failed loading plugin '%s'", _filename.c_str());
+			return false;
+		}
 
+		bool ret = DynamicPlugin::loadPlugin();
+
+		if (ret && _dlHandle) {
+			_dlHandle->discard_symtab();
+		}
+
+		return ret;
+};
+
 Plugin* DSPluginProvider::createPlugin(const Common::FSNode &node) const {
 	return new DSPlugin(node.getPath());
 }

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h	2010-08-06 06:03:34 UTC (rev 51777)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h	2010-08-06 06:54:44 UTC (rev 51778)
@@ -53,7 +53,7 @@
 			unloadPlugin();
 	}
 
-	bool loadPlugin();
+	virtual bool loadPlugin();
 	virtual void unloadPlugin();
 
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.