smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 08:53:08 +01:00
Code Issues Projects Releases Wiki Activity

OSC: change the word phase to polarity as per mailing list.

Browse source
This commit is contained in:
Len Ovens 2016-06-09 15:24:43 -07:00
parent be42151c0d
commit 049a678ff9
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -521,14 +521,13 @@ OSC::register_callbacks()
REGISTER_CALLBACK (serv, "/select/solo", "i", sel_solo);
REGISTER_CALLBACK (serv, "/select/monitor_input", "i", sel_monitor_input);
REGISTER_CALLBACK (serv, "/select/monitor_disk", "i", sel_monitor_disk);
REGISTER_CALLBACK (serv, "/select/polarity", "i", sel_phase);
REGISTER_CALLBACK (serv, "/select/gain", "f", sel_gain);
REGISTER_CALLBACK (serv, "/select/fader", "f", sel_fader);
REGISTER_CALLBACK (serv, "/select/trimdB", "f", sel_trim);
REGISTER_CALLBACK (serv, "/select/pan_stereo_position", "f", sel_pan_position);
REGISTER_CALLBACK (serv, "/select/pan_stereo_width", "f", sel_pan_width);
REGISTER_CALLBACK (serv, "/select/phase", "i", sel_phase);
/* These commands require the route index in addition to the arg; TouchOSC (et al) can't use these */
REGISTER_CALLBACK (serv, "/strip/mute", "ii", route_mute);
REGISTER_CALLBACK (serv, "/strip/solo", "ii", route_solo);
@ -538,7 +537,7 @@ OSC::register_callbacks()
REGISTER_CALLBACK (serv, "/strip/monitor_disk", "ii", route_monitor_disk);
REGISTER_CALLBACK (serv, "/strip/select", "ii", strip_select);
REGISTER_CALLBACK (serv, "/strip/gui_select", "ii", strip_gui_select);
REGISTER_CALLBACK (serv, "/strip/phase", "ii", strip_phase);
REGISTER_CALLBACK (serv, "/strip/polarity", "ii", strip_phase);
REGISTER_CALLBACK (serv, "/strip/gain", "if", route_set_gain_dB);
REGISTER_CALLBACK (serv, "/strip/fader", "if", route_set_gain_fader);
REGISTER_CALLBACK (serv, "/strip/trimabs", "if", route_set_trim_abs);
@ -1704,7 +1703,7 @@ OSC::sel_phase (uint32_t yn, lo_message msg)
if (sur->surface_sel) {
return strip_phase(sur->surface_sel, yn, msg);
} else {
return route_send_fail ("phase", 0, 0, lo_message_get_source (msg));
return route_send_fail ("polarity", 0, 0, lo_message_get_source (msg));
}
}

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

@ -75,8 +75,8 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
boost::shared_ptr<AutomationControl> phase_controllable = _strip->phase_control ();
if (phase_controllable) {
phase_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_change_message, this, X_("/select/phase"), _strip->phase_control()), OSC::instance());
send_change_message ("/select/phase", _strip->phase_control());
phase_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_change_message, this, X_("/select/polarity"), _strip->phase_control()), OSC::instance());
send_change_message ("/select/polarity", _strip->phase_control());
}
}
@ -134,7 +134,7 @@ OSCSelectObserver::~OSCSelectObserver ()
clear_strip ("/select/record_safe", 0);
clear_strip ("/select/monitor_input", 0);
clear_strip ("/select/monitor_disk", 0);
clear_strip ("/select/phase", 0);
clear_strip ("/select/polarity", 0);
}
if (feedback[1]) { // level controls
if (gainmode) {