X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc_cue_observer.cc;h=d36fdaf3a9f790ea4ee0e7178293421b6f196bc0;hb=33bfe681c94f7c9ba36a683521daf74b5834b3e9;hp=c846145ebcd8910e7af22565ecb6c946f48fb3fc;hpb=379ad3357df6cba267b7005aac572d6821487269;p=ardour.git diff --git a/libs/surfaces/osc/osc_cue_observer.cc b/libs/surfaces/osc/osc_cue_observer.cc index c846145ebc..d36fdaf3a9 100644 --- a/libs/surfaces/osc/osc_cue_observer.cc +++ b/libs/surfaces/osc/osc_cue_observer.cc @@ -19,6 +19,8 @@ #include "boost/lambda/lambda.hpp" +#include "pbd/control_math.h" + #include "ardour/track.h" #include "ardour/dB.h" #include "ardour/meter.h" @@ -43,11 +45,11 @@ OSCCueObserver::OSCCueObserver (boost::shared_ptr s, std::vectorPropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::name_changed, this, boost::lambda::_1, 0), OSC::instance()); name_changed (ARDOUR::Properties::name, 0); - _strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCCueObserver::send_change_message, this, X_("/cue/mute"), 0, _strip->mute_control()), OSC::instance()); + _strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::send_change_message, this, X_("/cue/mute"), 0, _strip->mute_control()), OSC::instance()); send_change_message ("/cue/mute", 0, _strip->mute_control()); gain_timeout.push_back (0); - _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCCueObserver::send_gain_message, this, 0, _strip->gain_control()), OSC::instance()); + _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::send_gain_message, this, 0, _strip->gain_control()), OSC::instance()); send_gain_message (0, _strip->gain_control()); send_init (); @@ -221,7 +223,7 @@ OSCCueObserver::send_gain_message (uint32_t id, boost::shared_ptr path = string_compose ("%1/%2", path, id); } lo_message msg = lo_message_new (); - lo_message_add_float (msg, gain_to_slider_position (controllable->get_value())); + lo_message_add_float (msg, controllable->internal_to_interface (controllable->get_value())); gain_timeout[id] = 8; lo_send_message (addr, path.c_str(), msg);