From bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 21 Jun 2010 21:36:36 +0000
Subject: Patch #1956501: "GUI/LAUNCHER: Midi device selection"

svn-id: r50128
---
 base/plugins.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 6c80da65d4..199344087c 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -167,6 +167,7 @@ public:
 		// Music 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(AUTO)
 		LINK_PLUGIN(NULL)
 		#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
 		LINK_PLUGIN(WINDOWS)
-- 
cgit v1.2.3


From 46ec88f74d9b7596cee2e6a167b1ccf361771601 Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Tue, 22 Jun 2010 15:30:41 +0000
Subject: GUI/LAUNCHER: This should fix the regression concerning pc speaker /
 pcjr support caused by patch #1956501

svn-id: r50145
---
 base/plugins.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 199344087c..39ee10c2cb 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -205,6 +205,8 @@ public:
 		LINK_PLUGIN(MT32)
 		#endif
 		LINK_PLUGIN(ADLIB)
+		LINK_PLUGIN(PCSPK)
+		LINK_PLUGIN(PCJR)
 		LINK_PLUGIN(TOWNS)
 		#if defined (UNIX)
 		LINK_PLUGIN(TIMIDITY)
-- 
cgit v1.2.3


From bb300ec671cfcd6fe7461dfd90615acfede2f1b9 Mon Sep 17 00:00:00 2001
From: Angus Lees
Date: Mon, 5 Jul 2010 00:09:41 +0000
Subject: Skip /dev/sequencer MIDI on Android.

svn-id: r50664
---
 base/plugins.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 39ee10c2cb..a6acd7e449 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -175,7 +175,7 @@ public:
 		#if defined(UNIX) && defined(USE_ALSA)
 		LINK_PLUGIN(ALSA)
 		#endif
-		#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) && !defined(__MINT__)
+		#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) && !defined(__MINT__) && !defined(__ANDROID__)
 		LINK_PLUGIN(SEQ)
 		#endif
 		#if defined(__MINT__)
-- 
cgit v1.2.3


From 0b48a71c9955b39117e2eb35b3e398f5c95c008a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 17 Jul 2010 18:41:38 +0000
Subject: Remove PalmOS port

svn-id: r50964
---
 base/plugins.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index a6acd7e449..29383f1009 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -191,13 +191,6 @@ public:
 		LINK_PLUGIN(COREAUDIO)
 		LINK_PLUGIN(COREMIDI)
 		#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
-- 
cgit v1.2.3


From 211fcfe7bab49ceeb5e81f4dcb1be7e73c58d7c9 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 Jul 2010 08:24:34 +0000
Subject: MIDI: Build and use ALSA driver if and only if USE_ALSA is defined

svn-id: r51053
---
 base/plugins.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 29383f1009..f23fbb48d8 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -172,7 +172,7 @@ public:
 		#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
 		LINK_PLUGIN(WINDOWS)
 		#endif
-		#if defined(UNIX) && defined(USE_ALSA)
+		#if defined(USE_ALSA)
 		LINK_PLUGIN(ALSA)
 		#endif
 		#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) && !defined(__MINT__) && !defined(__ANDROID__)
-- 
cgit v1.2.3


From 37aa8a7499e6aa1698beb7e241c42ba19475a83a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 Jul 2010 08:25:13 +0000
Subject: BUILD: Unify adding -DUNIX to DEFINES; complete SEQ MIDI detection

* Added a yes/no variable _unix to configure, which controls when
  -DUNIX is added to DEFINES
* Enable SEQ MIDI via _seq_midi by default on UNIX type systems,
  except for those which override that.
* Switch SEQ MIDI code to check #define USE_SEQ_MIDI
  (alternatively, we could compile it only conditionally...)

svn-id: r51055
---
 base/plugins.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index f23fbb48d8..5d0be11065 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -175,7 +175,7 @@ public:
 		#if defined(USE_ALSA)
 		LINK_PLUGIN(ALSA)
 		#endif
-		#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) && !defined(__MINT__) && !defined(__ANDROID__)
+		#if defined(USE_SEQ_MIDI)
 		LINK_PLUGIN(SEQ)
 		#endif
 		#if defined(__MINT__)
-- 
cgit v1.2.3