smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

OSC: MB spelling mistakes stopped compile fix

Browse source
This commit is contained in:
Len Ovens 2016-07-28 07:44:58 -07:00
parent f93f388845
commit 04029a656e
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/surfaces/osc/osc.cc
View file

@ -2377,6 +2377,9 @@ OSC::route_set_send_gain_dB (int ssid, int id, float val, lo_message msg)
boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg)); boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
float abs; float abs;
if (s) { if (s) {
if (id > 0) {
--id;
}
#ifdef MIXBUS #ifdef MIXBUS
abs = val; abs = val;
#else #else
@ -2385,9 +2388,6 @@ OSC::route_set_send_gain_dB (int ssid, int id, float val, lo_message msg)
} else { } else {
abs = dB_to_coefficient (val); abs = dB_to_coefficient (val);
} }
if (id > 0) {
--id;
}
#endif #endif
if (s->send_level_controllable (id)) { if (s->send_level_controllable (id)) {
s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup); s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
@ -2413,7 +2413,7 @@ OSC::route_set_send_fader (int ssid, int id, float val, lo_message msg)
if (s->send_level_controllable (id)) { if (s->send_level_controllable (id)) {
#ifdef MIXBUS #ifdef MIXBUS
abs = s->send_level_control(id)->interface_to_internal (val); abs = s->send_level_controllable(id)->interface_to_internal (val);
#else #else
abs = slider_position_to_gain_with_max (val, 2.0); abs = slider_position_to_gain_with_max (val, 2.0);
#endif #endif
@ -2436,6 +2436,9 @@ OSC::sel_sendgain (int id, float val, lo_message msg)
} }
float abs; float abs;
if (s) { if (s) {
if (id > 0) {
--id;
}
#ifdef MIXBUS #ifdef MIXBUS
abs = val; abs = val;
#else #else
@ -2444,9 +2447,6 @@ OSC::sel_sendgain (int id, float val, lo_message msg)
} else { } else {
abs = dB_to_coefficient (val); abs = dB_to_coefficient (val);
} }
if (id > 0) {
--id;
}
#endif #endif
if (s->send_level_controllable (id)) { if (s->send_level_controllable (id)) {
s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup); s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
@ -2475,7 +2475,7 @@ OSC::sel_sendfader (int id, float val, lo_message msg)
if (s->send_level_controllable (id)) { if (s->send_level_controllable (id)) {
#ifdef MIXBUS #ifdef MIXBUS
abs = s->send_level_control(id)->interface_to_internal (val); abs = s->send_level_controllable(id)->interface_to_internal (val);
#else #else
abs = slider_position_to_gain_with_max (val, 2.0); abs = slider_position_to_gain_with_max (val, 2.0);
#endif #endif

16
libs/surfaces/osc/osc_select_observer.cc
View file

@ -438,21 +438,13 @@ OSCSelectObserver::gain_message (string path, boost::shared_ptr<Controllable> co
lo_message msg = lo_message_new (); lo_message msg = lo_message_new ();
if (gainmode) { if (gainmode) {
#ifdef MIXBUS
lo_message_add_float (msg, controllable->internal_to_interface (val));
#else
lo_message_add_float (msg, gain_to_slider_position (controllable->get_value())); lo_message_add_float (msg, gain_to_slider_position (controllable->get_value()));
#endif
} else { } else {
#ifdef MIXBUS
lo_message_add_float (msg, val);
#else
if (controllable->get_value() < 1e-15) { if (controllable->get_value() < 1e-15) {
lo_message_add_float (msg, -200); lo_message_add_float (msg, -200);
} else { } else {
lo_message_add_float (msg, accurate_coefficient_to_dB (controllable->get_value())); lo_message_add_float (msg, accurate_coefficient_to_dB (controllable->get_value()));
} }
#endif
} }
lo_send_message (addr, path.c_str(), msg); lo_send_message (addr, path.c_str(), msg);
@ -468,14 +460,22 @@ OSCSelectObserver::send_gain (uint32_t id, boost::shared_ptr<PBD::Controllable>
if (gainmode) { if (gainmode) {
path = "/select/send_fader"; path = "/select/send_fader";
#ifdef MIXBUS
value = controllable->internal_to_interface (controllable->get_value());
#else
value = gain_to_slider_position (controllable->get_value()); value = gain_to_slider_position (controllable->get_value());
#endif
} else { } else {
path = "/select/send_gain"; path = "/select/send_gain";
#ifdef MIXBUS
value = controllable->get_value();
#else
if (controllable->get_value() < 1e-15) { if (controllable->get_value() < 1e-15) {
value = -193; value = -193;
} else { } else {
value = accurate_coefficient_to_dB (controllable->get_value()); value = accurate_coefficient_to_dB (controllable->get_value());
} }
#endif
} }
if (feedback[2]) { if (feedback[2]) {