Merged with trunk (painfully)

git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 17 insertions, 11 deletions

diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
index 904e6b3956..38ff95d9f0 100644
--- a/libs/surfaces/control_protocol/SConscript
+++ b/libs/surfaces/control_protocol/SConscript
@@ -36,7 +36,9 @@ cp.Merge ([
     libraries['pbd3'],
     libraries['midi++2'],
     libraries['xml'],
-    libraries['usb']
+    libraries['usb'],
+    libraries['glib2'],
+    libraries['glibmm2']
 	])
 
 libardour_cp = cp.SharedLibrary('ardour_cp', cp_files)
@@ -49,6 +51,6 @@ if env['NLS']:
 env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour_cp))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript', 'i18n.h', 'gettext.h' ] +
+				     [ 'SConscript' ] +
 				     cp_files + 
 				     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
index 9edb76327a..1760eb24e9 100644
--- a/libs/surfaces/generic_midi/SConscript
+++ b/libs/surfaces/generic_midi/SConscript
@@ -37,7 +37,9 @@ genericmidi.Merge ([
 	libraries['pbd3'],
 	libraries['sigc2'],
 	libraries['usb'],
-	libraries['xml']
+	libraries['xml'],
+    libraries['glib2'],
+    libraries['glibmm2']
 	])
 
 libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
@@ -50,6 +52,6 @@ if env['NLS']:
 env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_genericmidi))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript', 'i18n.h', 'gettext.h' ] +
+				     [ 'SConscript' ] +
 				     genericmidi_files + 
 				     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index fd669314ab..5eac060fb7 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -58,8 +58,7 @@ GenericMidiControlProtocol::send_route_feedback (list<Route*>& routes)
 			return;
 		} 
 		
-		// FIXME
-		//_port->write (buf, (int32_t) (end - buf));
+		_port->write (buf, 0, (int32_t) (end - buf));
 		//cerr << "MIDI feedback: wrote " << (int32_t) (end - buf) << " to midi port\n";
 	}
 }
diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
index 98ecf09d41..8f3568aa8f 100644
--- a/libs/surfaces/tranzport/SConscript
+++ b/libs/surfaces/tranzport/SConscript
@@ -37,7 +37,9 @@ tranzport.Merge ([
     libraries['pbd3'],
     libraries['midi++2'],
     libraries['xml'],
-    libraries['usb']
+    libraries['usb'],
+    libraries['glib2'],
+    libraries['glibmm2']
     ])
 
 libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files)
@@ -50,6 +52,6 @@ if env['NLS']:
 env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_tranzport))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript', 'i18n.h', 'gettext.h' ] +
+				     [ 'SConscript' ] +
 				     tranzport_files + 
 				     glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h
index 0311140f8c..44045f6834 100644
--- a/libs/surfaces/tranzport/tranzport_control_protocol.h
+++ b/libs/surfaces/tranzport/tranzport_control_protocol.h
@@ -4,10 +4,11 @@
 #include <vector>
 
 #include <sys/time.h>
-#include <pbd/lockmonitor.h>
 #include <pthread.h>
 #include <usb.h>
 
+#include <glibmm/thread.h>
+
 #include <ardour/types.h>
 
 #include "control_protocol.h"
@@ -95,7 +96,7 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol
 	DisplayMode     display_mode;
 	ARDOUR::gain_t  gain_fraction;
 
-	PBD::Lock update_lock;
+	Glib::Mutex update_lock;
 	char current_screen[2][20];
 	char pending_screen[2][20];
 	bool lights[7];
@@ -112,7 +113,7 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol
 	struct timeval last_wheel_motion;
 	int            last_wheel_dir;
 
-	PBD::Lock io_lock;
+	Glib::Mutex io_lock;
 
 	int open ();
 	int read (uint32_t timeout_override = 0);