Merged timbyr's win32 branch. -r 547:566.

git-svn-id: svn://localhost/ardour2/trunk@567 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 13 insertions, 7 deletions

diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript
index 7c3267a6c7..928372909c 100644
--- a/libs/midi++2/SConscript
+++ b/libs/midi++2/SConscript
@@ -7,7 +7,7 @@ import glob
 Import('env libraries install_prefix')
 
 midi2 = env.Copy()
-midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['pbd3'] ])
+midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glib2'], libraries['pbd3'] ])
 
 domain = 'midipp'
 
diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h
index 81e28615d0..a186f1fd5f 100644
--- a/libs/midi++2/midi++/port.h
+++ b/libs/midi++2/midi++/port.h
@@ -24,7 +24,6 @@
 
 #include <sigc++/sigc++.h>
 
-#include <pbd/selectable.h>
 #include <midi++/types.h>
 #include <midi++/parser.h>
 
@@ -67,7 +66,7 @@ class Port : public sigc::trackable {
 
 	virtual int selectable() const = 0;
 
-	void selector_read_callback (Select::Selectable *, Select::Condition);
+	//void selector_read_callback (Select::Selectable *, Select::Condition);
 
 	static void xforms_read_callback (int cond, int fd, void *ptr);
 	static void gtk_read_callback (void *ptr, int fd, int cond);
diff --git a/libs/midi++2/midimanager.cc b/libs/midi++2/midimanager.cc
index 7b3ed7d336..692c06fe92 100644
--- a/libs/midi++2/midimanager.cc
+++ b/libs/midi++2/midimanager.cc
@@ -18,8 +18,10 @@
 */
 
 #include <fcntl.h>
+
+#include <glib.h>
+
 #include <pbd/error.h>
-#include <pbd/basename.h>
 
 #include <midi++/types.h>
 #include <midi++/manager.h>
@@ -30,6 +32,8 @@
 using namespace std;
 using namespace MIDI;
 
+/* XXX check for strdup leaks */
+
 Manager *Manager::theManager = 0;
 
 Manager::Manager () 
@@ -312,7 +316,7 @@ Manager::parse_port_request (string str, Port::Type type)
 	   "devicename" is the full path to the requested file
 	   
 	   "tagname" (optional) is the name used to refer to the
-		         port. If not given, PBD::basename (devicename)
+		         port. If not given, g_path_get_basename (devicename)
 			 will be used.
 
 	   "mode" (optional) is either "r" or "w" or something else.
@@ -360,7 +364,8 @@ Manager::parse_port_request (string str, Port::Type type)
 		}
 
 	} else {
-		req->tagname = strdup (PBD::basename (req->devname));
+                // check when tagname is freed
+		req->tagname = g_path_get_basename (req->devname);
 		req->mode = O_RDWR;
 	}
 
diff --git a/libs/midi++2/midiport.cc b/libs/midi++2/midiport.cc
index 6d374ed8c0..a42aac2984 100644
--- a/libs/midi++2/midiport.cc
+++ b/libs/midi++2/midiport.cc
@@ -26,7 +26,7 @@
 #include <midi++/channel.h>
 #include <midi++/port_request.h>
 
-using namespace Select;
+//using namespace Select;
 using namespace MIDI;
 
 size_t Port::nports = 0;
@@ -96,6 +96,7 @@ Port::clock ()
 	return 0;
 }
 
+/*
 void
 Port::selector_read_callback (Selectable *s, Select::Condition cond) 
 
@@ -103,6 +104,7 @@ Port::selector_read_callback (Selectable *s, Select::Condition cond)
 	byte buf[64];
 	read (buf, sizeof (buf));
 }
+*/
 
 void
 Port::xforms_read_callback (int cond, int fd, void *ptr)