globally remove all trailing whitespace from ardour code base.

[ardour.git] / libs / gtkmm2ext / binding_proxy.cc

diff --git a/libs/gtkmm2ext/binding_proxy.cc b/libs/gtkmm2ext/binding_proxy.cc
index d0696b105f85c8a0d4b63e1600167ed2948d9f28..87473adcd2b571ac69cae03e5674fd8ec09a9466 100644 (file)
--- a/libs/gtkmm2ext/binding_proxy.cc
+++ b/libs/gtkmm2ext/binding_proxy.cc
@@ -31,21 +31,18 @@ using namespace Gtkmm2ext;
 using namespace std;
 using namespace PBD;
 
+guint BindingProxy::bind_button = 2;
+guint BindingProxy::bind_statemask = Gdk::CONTROL_MASK;
+
 BindingProxy::BindingProxy (boost::shared_ptr<Controllable> c)
        : prompter (0),
-         controllable (c),
-         bind_button (2),
-         bind_statemask (Gdk::CONTROL_MASK)
-
-{                        
+         controllable (c)
+{                      
 }
 
 BindingProxy::BindingProxy ()
-       : prompter (0),
-         bind_button (2),
-         bind_statemask (Gdk::CONTROL_MASK)
-
-{                        
+       : prompter (0)
+{                      
 }
 
 BindingProxy::~BindingProxy ()
@@ -69,17 +66,17 @@ BindingProxy::set_bind_button_state (guint button, guint statemask)
        bind_statemask = statemask;
 }
 
-void
-BindingProxy::get_bind_button_state (guint &button, guint &statemask)
+bool
+BindingProxy::is_bind_action (GdkEventButton *ev)
 {
-       button = bind_button;
-       statemask = bind_statemask;
+       return ( (ev->state & bind_statemask) && ev->button == bind_button );
 }
 
+
 bool
 BindingProxy::button_press_handler (GdkEventButton *ev)
 {
-       if (controllable && (ev->state & bind_statemask) && ev->button == bind_button) { 
+       if ( controllable && is_bind_action(ev) ) {
                if (Controllable::StartLearning (controllable.get())) {
                        string prompt = _("operate controller now");
                        if (prompter == 0) {
@@ -88,7 +85,7 @@ BindingProxy::button_press_handler (GdkEventButton *ev)
                        }
                        prompter->set_text (prompt);
                        prompter->touch (); // shows popup
-                       learning_connection = controllable->LearningFinished.connect (mem_fun (*this, &BindingProxy::learning_finished));
+                       controllable->LearningFinished.connect_same_thread (learning_connection, boost::bind (&BindingProxy::learning_finished, this));
                }
                return true;
        }
@@ -107,7 +104,7 @@ BindingProxy::learning_finished ()
 
 
 bool
-BindingProxy::prompter_hiding (GdkEventAny */*ev*/)
+BindingProxy::prompter_hiding (GdkEventAny* /*ev*/)
 {
        learning_connection.disconnect ();
        if (controllable) {