From 31320430de82972224b12461c241c3633d2534a6 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 27 Aug 2008 18:52:21 +0000
Subject: Partial commit of patch #2012839: Atari Patch for adding Native MIDI
 and Fix Compile

svn-id: r34194
---
 base/plugins.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 216c6ef1af..90e615e709 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -157,9 +157,12 @@ public:
 		#if defined(UNIX) && defined(USE_ALSA)
 		LINK_PLUGIN(ALSA)
 		#endif
-		#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__)
+		#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) && !defined(__MINT__)
 		LINK_PLUGIN(SEQ)
 		#endif
+		#if defined(__MINT__)
+		LINK_PLUGIN(STMIDI)
+		#endif
 		#if defined(IRIX)
 		LINK_PLUGIN(DMEDIA)
 		#endif
-- 
cgit v1.2.3


From 531bcf847ceef2b9eca82e0b3ef8473612889632 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 3 Sep 2008 11:22:51 +0000
Subject: Moved FilesystemNode / FSList to namespace Common; also got rid of
 some 'typedef Common::String String;' name aliases

svn-id: r34302
---
 base/plugins.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 90e615e709..7b372587a1 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -29,6 +29,7 @@
 
 #ifdef DYNAMIC_MODULES
 #include "common/config-manager.h"
+#include "common/fs.h"
 #endif
 
 // Plugin versioning
@@ -203,11 +204,11 @@ PluginList FilePluginProvider::getPlugins() {
 	PluginList pl;
 
 	// Prepare the list of directories to search
-	FSList pluginDirs;
+	Common::FSList pluginDirs;
 
 	// Add the default directories
-	pluginDirs.push_back(FilesystemNode("."));
-	pluginDirs.push_back(FilesystemNode("plugins"));
+	pluginDirs.push_back(Common::FilesystemNode("."));
+	pluginDirs.push_back(Common::FilesystemNode("plugins"));
 
 	// Add the provider's custom directories
 	addCustomDirectories(pluginDirs);
@@ -215,21 +216,21 @@ PluginList FilePluginProvider::getPlugins() {
 	// Add the user specified directory
 	Common::String pluginsPath(ConfMan.get("pluginspath"));
 	if (!pluginsPath.empty())
-		pluginDirs.push_back(FilesystemNode(pluginsPath));
+		pluginDirs.push_back(Common::FilesystemNode(pluginsPath));
 
-	FSList::const_iterator dir;
+	Common::FSList::const_iterator dir;
 	for (dir = pluginDirs.begin(); dir != pluginDirs.end(); dir++) {
 		// Load all plugins.
 		// Scan for all plugins in this directory
-		FSList files;
-		if (!dir->getChildren(files, FilesystemNode::kListFilesOnly)) {
+		Common::FSList files;
+		if (!dir->getChildren(files, Common::FilesystemNode::kListFilesOnly)) {
 			debug(1, "Couldn't open plugin directory '%s'", dir->getPath().c_str());
 			continue;
 		} else {
 			debug(1, "Reading plugins from plugin directory '%s'", dir->getPath().c_str());
 		}
 
-		for (FSList::const_iterator i = files.begin(); i != files.end(); ++i) {
+		for (Common::FSList::const_iterator i = files.begin(); i != files.end(); ++i) {
 			if (isPluginFilename(i->getName())) {
 				pl.push_back(createPlugin(i->getPath()));
 			}
@@ -255,9 +256,9 @@ bool FilePluginProvider::isPluginFilename(const Common::String &filename) const
 	return true;
 }
 
-void FilePluginProvider::addCustomDirectories(FSList &dirs) const {
+void FilePluginProvider::addCustomDirectories(Common::FSList &dirs) const {
 #ifdef PLUGIN_DIRECTORY
-	dirs.push_back(FilesystemNode(PLUGIN_DIRECTORY));
+	dirs.push_back(Common::FilesystemNode(PLUGIN_DIRECTORY));
 #endif
 }
 
@@ -379,7 +380,7 @@ GameDescriptor EngineManager::findGame(const Common::String &gameName, const Eng
 	return result;
 }
 
-GameList EngineManager::detectGames(const FSList &fslist) const {
+GameList EngineManager::detectGames(const Common::FSList &fslist) const {
 	GameList candidates;
 
 	const EnginePlugin::List &plugins = getPlugins();
-- 
cgit v1.2.3