resolve ambiguity

[ardour.git] / libs / surfaces / osc / osc_select_observer.cc

diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc
index 2cc42569cc86c57ca0fc64bd4848d4e77ee486ea..d06779fc40616c0d925b8597b949deee67339d1e 100644 (file)
--- a/libs/surfaces/osc/osc_select_observer.cc
+++ b/libs/surfaces/osc/osc_select_observer.cc
@@ -52,7 +52,7 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
        ,_last_gain (0.0)
 {
        addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a));
-       as = ARDOUR::AutoState::Off;
+       as = ARDOUR::Off;
 
        if (feedback[0]) { // buttons are separate feedback
                _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::name_changed, this, boost::lambda::_1), OSC::instance());
@@ -103,11 +103,11 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
        if (feedback[1]) { // level controls
                boost::shared_ptr<GainControl> gain_cont = _strip->gain_control();
                if (gainmode) {
-                       gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCSelectObserver::gain_automation, this, X_("/select/fader")), OSC::instance());
+                       gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_automation, this, X_("/select/fader")), OSC::instance());
                        gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_message, this, X_("/select/fader"), gain_cont), OSC::instance());
                        gain_automation ("/select/fader");
                } else {
-                       gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCSelectObserver::gain_automation, this, X_("/select/gain")), OSC::instance());
+                       gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_automation, this, X_("/select/gain")), OSC::instance());
                        gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_message, this, X_("/select/gain"), _strip->gain_control()), OSC::instance());
                        gain_automation ("/strip/gain");
                }
@@ -372,7 +372,7 @@ OSCSelectObserver::tick ()
                }
        }
        if (feedback[1]) {
-               if (as != ARDOUR::AutoState::Off) {
+               if (as != ARDOUR::Off) {
                        if(_last_gain != _strip->gain_control()->get_value()) {
                                _last_gain = _strip->gain_control()->get_value();
                                if (gainmode) {