MIDI/Controllables for monitor section, and related fixes

git-svn-id: svn://localhost/ardour2/branches/3.0@6863 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 77 insertions, 100 deletions

diff --git a/libs/gtkmm2ext/bindable_button.cc b/libs/gtkmm2ext/bindable_button.cc
index 3c3cad6e46..5c0cc3c958 100644
--- a/libs/gtkmm2ext/bindable_button.cc
+++ b/libs/gtkmm2ext/bindable_button.cc
@@ -18,122 +18,43 @@
 */
 
 #include <string>
-#include <climits>
 #include <iostream>
 
-#include <midi++/controllable.h>
+#include "pbd/controllable.h"
 
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/bindable_button.h>
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/bindable_button.h"
+#include "gtkmm2ext/gui_thread.h"
 
 #include "i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace std;
-
-BindableToggleButton::BindableToggleButton (MIDI::Controllable *mc)
-	: prompter (Gtk::WIN_POS_MOUSE, 30000, false),
-	  midi_control (mc),
-	  bind_button (2),
-	  bind_statemask (Gdk::CONTROL_MASK)
-
-{			  
-	init_events ();
-}
-
-BindableToggleButton::BindableToggleButton(MIDI::Controllable *mc, const string &label)
-	: StatefulButton (label),
-	  prompter (Gtk::WIN_POS_MOUSE, 30000, false),
-	  midi_control (mc),
-	  bind_button (2),
-	  bind_statemask (Gdk::CONTROL_MASK)
-{			  
-	init_events ();
-}
-
+using namespace PBD;
 
 void
-BindableToggleButton::init_events ()
+BindableToggleButton::set_controllable (boost::shared_ptr<PBD::Controllable> c)
 {
-	prompter.signal_unmap_event().connect (mem_fun (*this, &BindableToggleButton::prompter_hiding));
-	
-	prompting = false;
-	unprompting = false;
-	
-	if (midi_control) {
-		midi_control->learning_started.connect (mem_fun (*this, &BindableToggleButton::midicontrol_prompt));
-		midi_control->learning_stopped.connect (mem_fun (*this, &BindableToggleButton::midicontrol_unprompt));
-	}
+        watch_connection.disconnect ();
+        binding_proxy.set_controllable (c);
 }
 
 void
-BindableToggleButton::set_bind_button_state (guint button, guint statemask)
+BindableToggleButton::watch ()
 {
-	bind_button = button;
-	bind_statemask = statemask;
-}
+        boost::shared_ptr<Controllable> c (binding_proxy.get_controllable ());
 
-void
-BindableToggleButton::get_bind_button_state (guint &button, guint &statemask)
-{
-	button = bind_button;
-	statemask = bind_statemask;
-}
+        if (!c) {
+                warning << _("button cannot watch state of non-existing Controllable\n") << endl;
+                return;
+        }
 
-void
-BindableToggleButton::midi_learn()
-{
-	if (midi_control) {
-		prompting = true;
-		midi_control->learn_about_external_control ();
-	}
-}
-
-bool
-BindableToggleButton::prompter_hiding (GdkEventAny *ev)
-{
-	if (unprompting) {
-		if (midi_control) {
-			midi_control->stop_learning();
-		}
-		unprompting = false;
-	}
-	
-	return false;
-}
-
-
-void
-BindableToggleButton::midicontrol_set_tip ()
-
-{
-	if (midi_control) {
-		// Gtkmm2ext::UI::instance()->set_tip (evbox, midi_control->control_description());
-	}
-}
-
-void
-BindableToggleButton::midicontrol_prompt ()
-
-{
-	if (prompting) {
-		string prompt = _("operate MIDI controller now");
-		prompter.set_text (prompt);
-		Gtkmm2ext::UI::instance()->touch_display (&prompter);
-		
-		unprompting = true;
-		prompting = false;
-	}
+        c->Changed.connect (watch_connection, invalidator(*this), boost::bind (&BindableToggleButton::controllable_changed, this), gui_context());
 }
 
 void
-BindableToggleButton::midicontrol_unprompt ()
-
+BindableToggleButton::controllable_changed ()
 {
-	if (unprompting) {
-		Gtkmm2ext::UI::instance()->touch_display (&prompter);
-		unprompting = false;
-	}
+        float val = binding_proxy.get_controllable()->get_value();
+        set_active (fabs (val) >= 0.5f);
 }
-
-
diff --git a/libs/gtkmm2ext/gtkmm2ext/bindable_button.h b/libs/gtkmm2ext/gtkmm2ext/bindable_button.h
index 18e3ceb339..5ac81d8507 100644
--- a/libs/gtkmm2ext/gtkmm2ext/bindable_button.h
+++ b/libs/gtkmm2ext/gtkmm2ext/bindable_button.h
@@ -22,7 +22,8 @@
 
 #include <string>
 
-#include <gtkmm2ext/stateful_button.h>
+#include "pbd/signals.h"
+#include "gtkmm2ext/stateful_button.h"
 #include "binding_proxy.h"
 
 namespace PBD {
@@ -48,8 +49,13 @@ class BindableToggleButton : public Gtkmm2ext::StatefulToggleButton
 	}
 	
 	boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
- 	void set_controllable (boost::shared_ptr<PBD::Controllable> c) { binding_proxy.set_controllable (c); }
- 
+ 	void set_controllable (boost::shared_ptr<PBD::Controllable> c);
+        void watch ();
+
+  protected:
+        void controllable_changed ();
+        PBD::ScopedConnection watch_connection;
+
   private:
 	BindingProxy binding_proxy;
 };
diff --git a/libs/gtkmm2ext/gtkmm2ext/gui_thread.h b/libs/gtkmm2ext/gtkmm2ext/gui_thread.h
new file mode 100644
index 0000000000..16dc0600a1
--- /dev/null
+++ b/libs/gtkmm2ext/gtkmm2ext/gui_thread.h
@@ -0,0 +1,40 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __ardour_gtk_gui_thread_h__
+#define __ardour_gtk_gui_thread_h__
+
+#include <cstdlib>
+#include <gtkmm2ext/gtk_ui.h>
+#include <boost/bind.hpp>
+#include <boost/bind/protect.hpp>
+
+namespace sigc {
+        class trackable;
+}
+
+#define ENSURE_GUI_THREAD(obj,method, ...) if (!Gtkmm2ext::UI::instance()->caller_is_self()) { abort (); } 
+
+#define gui_context() Gtkmm2ext::UI::instance() /* a UICallback-derived object that specifies the event loop for GUI signal handling */
+#define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__))
+
+extern PBD::EventLoop::InvalidationRecord* __invalidator (sigc::trackable& trackable, const char*, int);
+#define invalidator(x) __invalidator ((x), __FILE__, __LINE__)
+
+#endif /* __ardour_gtk_gui_thread_h__ */
diff --git a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h
index a3a06d39d3..cb256bed22 100644
--- a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h
+++ b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h
@@ -24,6 +24,8 @@
 #include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
 
+#include "gtkmm2ext/binding_proxy.h"
+
 namespace Gtk {
 	class Adjustment;
 	class SpinButton;
@@ -59,6 +61,8 @@ class MotionFeedback : public Gtk::VBox
 	gfloat upper () { return _upper; }
 	gfloat range () { return _range; }
 
+	void set_controllable (boost::shared_ptr<PBD::Controllable> c) { binding_proxy.set_controllable (c); }
+
  protected:
 	gfloat _range;
 	gfloat _lower;
@@ -84,6 +88,7 @@ class MotionFeedback : public Gtk::VBox
 	Gtk::SpinButton*   value;
 	Gtk::Adjustment*   adjustment;
 	Glib::RefPtr<Gdk::Pixbuf> pixbuf;
+        BindingProxy       binding_proxy;
 
         double default_value;
 	double  step_inc;
diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc
index 19ce16d815..06aa2e507e 100644
--- a/libs/gtkmm2ext/motionfeedback.cc
+++ b/libs/gtkmm2ext/motionfeedback.cc
@@ -138,6 +138,10 @@ MotionFeedback::set_adjustment (Adjustment *adj)
 bool
 MotionFeedback::pixwin_button_press_event (GdkEventButton *ev) 
 { 
+        if (binding_proxy.button_press_handler (ev)) {
+                return true;
+	}
+
 	switch (ev->button) {
 	case 2:
 		return FALSE;  /* XXX why ? */
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index dec5c94c5d..1db7016a24 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -23,6 +23,7 @@ gtkmm2ext_sources = [
 	'auto_spin.cc',
 	'barcontroller.cc',
 	'binding_proxy.cc',
+	'bindable_button.cc',
 	'cell_renderer_pixbuf_multi.cc',
 	'cell_renderer_pixbuf_toggle.cc',
 	'choice.cc',