From 86149840a1a3950a86dec2a8c0daa974e23e54c2 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 10 May 2017 05:00:03 +0200 Subject: [PATCH] resolve ambiguity --- libs/surfaces/osc/osc_route_observer.cc | 4 ++-- libs/surfaces/osc/osc_select_observer.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc index d721c2dd60..c379ede4ed 100644 --- a/libs/surfaces/osc/osc_route_observer.cc +++ b/libs/surfaces/osc/osc_route_observer.cc @@ -79,11 +79,11 @@ OSCRouteObserver::OSCRouteObserver (boost::shared_ptr s, lo_address a if (feedback[1]) { // level controls boost::shared_ptr gain_cont = _strip->gain_control(); if (gainmode) { - gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::gain_automation, this, X_("/strip/fader")), OSC::instance()); + gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this, X_("/strip/fader")), OSC::instance()); gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/fader"), gain_cont), OSC::instance()); gain_automation ("/strip/fader"); } else { - gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::gain_automation, this, X_("/strip/gain")), OSC::instance()); + gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this, X_("/strip/gain")), OSC::instance()); gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/gain"), gain_cont), OSC::instance()); gain_automation ("/strip/gain"); } diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc index edd3baab2f..d06779fc40 100644 --- a/libs/surfaces/osc/osc_select_observer.cc +++ b/libs/surfaces/osc/osc_select_observer.cc @@ -103,11 +103,11 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr s, lo_address if (feedback[1]) { // level controls boost::shared_ptr 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"); } -- 2.30.2