breakout control protocol code into LGPL library; fix panner buttons even more than nick did, plus some other bits and pieces

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

6 files changed, 24 insertions, 20 deletions

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index ad1d9f4655..db89dfa457 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -24,6 +24,7 @@ gtkardour.Append(POTFILE=domain + '.pot')
 
 gtkardour.Merge ([
     libraries['ardour'],
+    libraries['ardour_cp'],
     libraries['gtkmm2ext'],
 #    libraries['flowcanvas'],
     libraries['midi++2'],
diff --git a/gtk2_ardour/ardev_common.sh b/gtk2_ardour/ardev_common.sh
index 7e1da03ba0..a705101adb 100755
--- a/gtk2_ardour/ardev_common.sh
+++ b/gtk2_ardour/ardev_common.sh
@@ -2,7 +2,7 @@
 
 export ARDOUR_PATH=./glade:./pixmaps:.:..
 
-export LD_LIBRARY_PATH=../libs/ardour:../libs/midi++2:../libs/pbd3:../libs/soundtouch:../libs/gtkmm2ext:../libs/sigc++2:../libs/glibmm2:../libs/gtkmm2/atk:../libs/gtkmm2/pango:../libs/gtkmm2/gdk:../libs/gtkmm2/gtk:../libs/libgnomecanvasmm:../libs/libglademm:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=../libs/surfaces/control_protocol:../libs/ardour:../libs/midi++2:../libs/pbd3:../libs/soundtouch:../libs/gtkmm2ext:../libs/sigc++2:../libs/glibmm2:../libs/gtkmm2/atk:../libs/gtkmm2/pango:../libs/gtkmm2/gdk:../libs/gtkmm2/gtk:../libs/libgnomecanvasmm:../libs/libglademm:$LD_LIBRARY_PATH
 
 # DYLD_LIBRARY_PATH is for darwin.
 export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index f8d4943fd7..5bcad97d26 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -34,7 +34,8 @@
 
 #include <ardour/session.h>
 #include <ardour/control_protocol_manager.h>
-#include <ardour/control_protocol.h>
+
+#include "control_protocol.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e10793fe38..de58b60f86 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -47,7 +47,8 @@
 #include <ardour/session_route.h>
 #include <ardour/tempo.h>
 #include <ardour/utils.h>
-#include <ardour/control_protocol.h>
+
+#include "control_protocol.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 828cf72579..f430e9c19a 100644
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -123,9 +123,9 @@ PannerUI::PannerUI (IO& io, Session& s)
 		(mem_fun(*this, &PannerUI::panning_link_direction_clicked));
 
 	panning_link_button.signal_button_press_event().connect
-		(mem_fun(*this, &PannerUI::panning_link_button_press));
+		(mem_fun(*this, &PannerUI::panning_link_button_press), false);
 	panning_link_button.signal_button_release_event().connect
-		(mem_fun(*this, &PannerUI::panning_link_button_release));
+		(mem_fun(*this, &PannerUI::panning_link_button_release), false);
 
 	panning_up.set_border_width (3);
 	panning_down.set_border_width (3);
@@ -154,19 +154,21 @@ PannerUI::PannerUI (IO& io, Session& s)
 	pan_automation_state_changed ();
 }
 
-gint
+bool
 PannerUI::panning_link_button_press (GdkEventButton* ev)
 {
-	return stop_signal (panning_link_button, "button-press-event");
+	cerr << "link press\n";
+	return true;
 }
 
-gint
+bool
 PannerUI::panning_link_button_release (GdkEventButton* ev)
 {
+	cerr << "link release\n";
 	if (!ignore_toggle) {
 		_io.panner().set_linked (!_io.panner().linked());
 	}
-	return TRUE;
+	return true;
 }
 
 void
@@ -395,7 +397,7 @@ PannerUI::setup_pan ()
 	}
 }
 
-gint
+bool
 PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which)
 {
 	switch (ev->button) {
@@ -406,13 +408,13 @@ PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which)
 		}
 		build_pan_menu (which);
 		pan_menu->popup (1, ev->time);
-		return TRUE;
+		return true;
 		break;
 	default:
-		return FALSE;
+		return false;
 	}
 
-	return FALSE; // what's wrong with gcc?
+	return false; // what's wrong with gcc?
 }
 
 void
diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 78fc86885d..80b14465cf 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -90,22 +90,20 @@ class PannerUI : public Gtk::HBox
 	Gtk::Arrow          panning_down_arrow;
 	Gtk::VBox           pan_vbox;
 	Width              _width;
-	gint panning_scroll_button_press_event (GdkEventButton*, int32_t dir);
-	gint panning_scroll_button_release_event (GdkEventButton*, int32_t dir);
-	
+
 	Gtk::ToggleButton   panning_link_button;
 	Gtk::Button         panning_link_direction_button;
 	Gtk::HBox           panning_link_box;
 
+	bool panning_link_button_press (GdkEventButton*);
+	bool panning_link_button_release (GdkEventButton*);
+
 	Gtk::Menu pan_astate_menu;
 	Gtk::Menu pan_astyle_menu;
 
 	Gtk::Button pan_automation_style_button;
 	Gtk::ToggleButton pan_automation_state_button;
 
-
-	gint panning_link_button_press (GdkEventButton*);
-	gint panning_link_button_release (GdkEventButton*);
 	void panning_link_direction_clicked ();
 
 	vector<Gtk::Adjustment*> pan_adjustments;
@@ -128,7 +126,8 @@ class PannerUI : public Gtk::HBox
 	gint start_pan_touch (GdkEventButton*);
 	gint end_pan_touch (GdkEventButton*);
 
-	gint pan_button_event (GdkEventButton*, uint32_t which);
+	bool pan_button_event (GdkEventButton*, uint32_t which);
+
 	Gtk::Menu* pan_menu;
 	Gtk::CheckMenuItem* bypass_menu_item;
 	void build_pan_menu (uint32_t which);