allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

noop OSC: path strings should not get tranlated

Browse Source
This commit is contained in:
Len Ovens
2018-02-06 12:01:06 -08:00
parent 3ac47220a0
commit 3504ecff5f
5 changed files with 606 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

772
libs/surfaces/osc/osc.cc
View File

File diff suppressed because it is too large Load Diff

30
libs/surfaces/osc/osc_cue_observer.cc
View File

@@ -66,10 +66,10 @@ OSCCueObserver::clear_observer ()
strip_connections.drop_connections ();
send_end (0);
// all strip buttons should be off and faders 0 and etc.
_osc.text_message_with_id ("/cue/name", 0, " ", true, addr);
_osc.float_message ("/cue/mute", 0, addr);
_osc.float_message ("/cue/fader", 0, addr);
_osc.float_message ("/cue/signal", 0, addr);
_osc.text_message_with_id (X_("/cue/name"), 0, " ", true, addr);
_osc.float_message (X_("/cue/mute"), 0, addr);
_osc.float_message (X_("/cue/fader"), 0, addr);
_osc.float_message (X_("/cue/signal"), 0, addr);
}
@@ -89,7 +89,7 @@ OSCCueObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip, S
name_changed (ARDOUR::Properties::name, 0);
_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());
send_change_message (X_("/cue/mute"), 0, _strip->mute_control());
gain_timeout.push_back (0);
_last_gain.push_back (-1.0);
@@ -122,7 +122,7 @@ OSCCueObserver::tick ()
} else {
signal = 1;
}
_osc.float_message ("/cue/signal", signal, addr);
_osc.float_message (X_("/cue/signal"), signal, addr);
}
_last_meter = now_meter;
@@ -176,9 +176,9 @@ OSCCueObserver::send_end (uint32_t new_size)
send_connections.drop_connections ();
if (new_size < sends.size()) {
for (uint32_t i = new_size + 1; i <= sends.size(); i++) {
_osc.float_message (string_compose ("/cue/send/fader/%1", i), 0, addr);
_osc.float_message (string_compose ("/cue/send/enable/%1", i), 0, addr);
_osc.text_message_with_id ("/cue/send/name", i, " ", true, addr);
_osc.float_message (string_compose (X_("/cue/send/fader/%1"), i), 0, addr);
_osc.float_message (string_compose (X_("/cue/send/enable/%1"), i), 0, addr);
_osc.text_message_with_id (X_("/cue/send/name"), i, " ", true, addr);
}
}
gain_timeout.clear ();
@@ -206,9 +206,9 @@ OSCCueObserver::name_changed (const PBD::PropertyChange& what_changed, uint32_t
return;
}
if (id) {
_osc.text_message_with_id ("/cue/send/name", id, sends[id - 1]->name(), true, addr);
_osc.text_message_with_id (X_("/cue/send/name"), id, sends[id - 1]->name(), true, addr);
} else {
_osc.text_message ("/cue/name", _strip->name(), addr);
_osc.text_message (X_("/cue/name"), _strip->name(), addr);
}
}
@@ -231,11 +231,11 @@ OSCCueObserver::send_gain_message (uint32_t id, boost::shared_ptr<Controllable>
return;
}
if (id) {
_osc.text_message_with_id ("/cue/send/name", id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), true, addr);
_osc.float_message_with_id ("/cue/send/fader", id, controllable->internal_to_interface (controllable->get_value()), true, addr);
_osc.text_message_with_id (X_("/cue/send/name"), id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), true, addr);
_osc.float_message_with_id (X_("/cue/send/fader"), id, controllable->internal_to_interface (controllable->get_value()), true, addr);
} else {
_osc.text_message ("/cue/name", string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), addr);
_osc.float_message ("/cue/fader", controllable->internal_to_interface (controllable->get_value()), addr);
_osc.text_message (X_("/cue/name"), string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), addr);
_osc.float_message (X_("/cue/fader"), controllable->internal_to_interface (controllable->get_value()), addr);
}
gain_timeout[id] = 8;

54
libs/surfaces/osc/osc_global_observer.cc
View File

@@ -70,21 +70,21 @@ OSCGlobalObserver::OSCGlobalObserver (OSC& o, Session& s, ArdourSurface::OSC::OS
boost::shared_ptr<Controllable> mute_controllable = boost::dynamic_pointer_cast<Controllable>(strip->mute_control());
mute_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_change_message, this, X_("/master/mute"), strip->mute_control()), OSC::instance());
send_change_message ("/master/mute", strip->mute_control());
send_change_message (X_("/master/mute"), strip->mute_control());
boost::shared_ptr<Controllable> trim_controllable = boost::dynamic_pointer_cast<Controllable>(strip->trim_control());
trim_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_trim_message, this, X_("/master/trimdB"), strip->trim_control()), OSC::instance());
send_trim_message ("/master/trimdB", strip->trim_control());
send_trim_message (X_("/master/trimdB"), strip->trim_control());
boost::shared_ptr<Controllable> pan_controllable = boost::dynamic_pointer_cast<Controllable>(strip->pan_azimuth_control());
if (pan_controllable) {
pan_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_change_message, this, X_("/master/pan_stereo_position"), strip->pan_azimuth_control()), OSC::instance());
send_change_message ("/master/pan_stereo_position", strip->pan_azimuth_control());
send_change_message (X_("/master/pan_stereo_position"), strip->pan_azimuth_control());
}
boost::shared_ptr<Controllable> gain_controllable = boost::dynamic_pointer_cast<Controllable>(strip->gain_control());
gain_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_gain_message, this, X_("/master/"), strip->gain_control()), OSC::instance());
send_gain_message ("/master/", strip->gain_control());
send_gain_message (X_("/master/"), strip->gain_control());
// monitor stuff next
strip = session->monitor_out();
@@ -93,19 +93,19 @@ OSCGlobalObserver::OSCGlobalObserver (OSC& o, Session& s, ArdourSurface::OSC::OS
boost::shared_ptr<Controllable> mon_mute_cont = strip->monitor_control()->cut_control();
mon_mute_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_change_message, this, X_("/monitor/mute"), mon_mute_cont), OSC::instance());
send_change_message ("/monitor/mute", mon_mute_cont);
send_change_message (X_("/monitor/mute"), mon_mute_cont);
boost::shared_ptr<Controllable> mon_dim_cont = strip->monitor_control()->dim_control();
mon_dim_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_change_message, this, X_("/monitor/dim"), mon_dim_cont), OSC::instance());
send_change_message ("/monitor/dim", mon_dim_cont);
send_change_message (X_("/monitor/dim"), mon_dim_cont);
boost::shared_ptr<Controllable> mon_mono_cont = strip->monitor_control()->mono_control();
mon_mono_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_change_message, this, X_("/monitor/mono"), mon_mono_cont), OSC::instance());
send_change_message ("/monitor/mono", mon_mono_cont);
send_change_message (X_("/monitor/mono"), mon_mono_cont);
gain_controllable = boost::dynamic_pointer_cast<Controllable>(strip->gain_control());
gain_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_gain_message, this, X_("/monitor/"), strip->gain_control()), OSC::instance());
send_gain_message ("/monitor/", strip->gain_control());
send_gain_message (X_("/monitor/"), strip->gain_control());
}
//Transport feedback
@@ -125,7 +125,7 @@ OSCGlobalObserver::OSCGlobalObserver (OSC& o, Session& s, ArdourSurface::OSC::OS
boost::shared_ptr<Controllable> click_controllable = boost::dynamic_pointer_cast<Controllable>(session->click_gain()->gain_control());
click_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_change_message, this, X_("/click/level"), click_controllable), OSC::instance());
send_change_message ("/click/level", click_controllable);
send_change_message (X_("/click/level"), click_controllable);
session->route_group_added.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::group_changed, this, _1), OSC::instance());
session->route_group_removed.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::group_changed, this), OSC::instance());
@@ -187,16 +187,16 @@ OSCGlobalObserver::clear_observer ()
if (feedback[9]) {
_osc.float_message (X_("/master/signal"), 0, addr);
}
_osc.float_message ("/master/fader", 0, addr);
_osc.float_message ("/monitor/fader", 0, addr);
_osc.float_message ("/master/gain", -193, addr);
_osc.float_message ("/monitor/gain", -193, addr);
_osc.float_message (X_("/master/fader"), 0, addr);
_osc.float_message (X_("/monitor/fader"), 0, addr);
_osc.float_message (X_("/master/gain"), -193, addr);
_osc.float_message (X_("/monitor/gain"), -193, addr);
_osc.float_message (X_("/master/trimdB"), 0, addr);
_osc.float_message ("/master/mute", 0, addr);
_osc.float_message ("/master/pan_stereo_position", 0.5, addr);
_osc.float_message ("/monitor/mute", 0, addr);
_osc.float_message ("/monitor/dim", 0, addr);
_osc.float_message ("/monitor/mono", 0, addr);
_osc.float_message (X_("/master/mute"), 0, addr);
_osc.float_message (X_("/master/pan_stereo_position"), 0.5, addr);
_osc.float_message (X_("/monitor/mute"), 0, addr);
_osc.float_message (X_("/monitor/dim"), 0, addr);
_osc.float_message (X_("/monitor/mono"), 0, addr);
_osc.float_message (X_("/loop_toggle"), 0, addr);
_osc.float_message (X_("/transport_play"), 0, addr);
_osc.float_message (X_("/transport_stop"), 0, addr);
@@ -239,7 +239,7 @@ OSCGlobalObserver::tick ()
os << ':';
os << setw(2) << setfill('0') << timecode.frames;
_osc.text_message ("/position/smpte", os.str(), addr);
_osc.text_message (X_("/position/smpte"), os.str(), addr);
}
if (feedback[5]) { // Bar beat enabled
Timecode::BBT_Time bbt_time;
@@ -255,7 +255,7 @@ OSCGlobalObserver::tick ()
os << '|';
os << setw(4) << setfill('0') << bbt_time.ticks;
_osc.text_message ("/position/bbt", os.str(), addr);
_osc.text_message (X_("/position/bbt"), os.str(), addr);
}
if (feedback[11]) { // minutes/seconds enabled
samplepos_t left = now_sample;
@@ -277,12 +277,12 @@ OSCGlobalObserver::tick ()
os << '.';
os << setw(3) << setfill('0') << millisecs;
_osc.text_message ("/position/time", os.str(), addr);
_osc.text_message (X_("/position/time"), os.str(), addr);
}
if (feedback[10]) { // samples
ostringstream os;
os << now_sample;
_osc.text_message ("/position/samples", os.str(), addr);
_osc.text_message (X_("/position/samples"), os.str(), addr);
}
_last_sample = now_sample;
mark_update ();
@@ -361,7 +361,7 @@ void
OSCGlobalObserver::send_gain_message (string path, boost::shared_ptr<Controllable> controllable)
{
bool ismaster = false;
if (path.find("master") != std::string::npos) {
if (path.find(X_("master")) != std::string::npos) {
ismaster = true;
if (_last_master_gain != controllable->get_value()) {
_last_master_gain = controllable->get_value();
@@ -376,9 +376,9 @@ OSCGlobalObserver::send_gain_message (string path, boost::shared_ptr<Controllabl
}
}
if (gainmode) {
_osc.float_message (string_compose ("%1fader", path), controllable->internal_to_interface (controllable->get_value()), addr);
_osc.float_message (string_compose (X_("%1fader"), path), controllable->internal_to_interface (controllable->get_value()), addr);
if (gainmode == 1) {
_osc.text_message (string_compose ("%1name", path), string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), addr);
_osc.text_message (string_compose (X_("%1name"), path), string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), addr);
if (ismaster) {
master_timeout = 8;
} else {
@@ -388,9 +388,9 @@ OSCGlobalObserver::send_gain_message (string path, boost::shared_ptr<Controllabl
}
if (!gainmode || gainmode == 2) {
if (controllable->get_value() < 1e-15) {
_osc.float_message (string_compose ("%1gain",path), -200, addr);
_osc.float_message (string_compose (X_("%1gain"),path), -200, addr);
} else {
_osc.float_message (string_compose ("%1gain",path), accurate_coefficient_to_dB (controllable->get_value()), addr);
_osc.float_message (string_compose (X_("%1gain"),path), accurate_coefficient_to_dB (controllable->get_value()), addr);
}
}
}

110
libs/surfaces/osc/osc_route_observer.cc
View File

@@ -136,22 +136,22 @@ OSCRouteObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip,
group_name ();
_strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::pi_changed, this, _1), OSC::instance());
_osc.int_message_with_id ("/strip/hide", ssid, _strip->is_hidden (), in_line, addr);
_osc.int_message_with_id (X_("/strip/hide"), ssid, _strip->is_hidden (), in_line, addr);
_strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/mute"), _strip->mute_control()), OSC::instance());
send_change_message ("/strip/mute", _strip->mute_control());
send_change_message (X_("/strip/mute"), _strip->mute_control());
_strip->solo_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/solo"), _strip->solo_control()), OSC::instance());
send_change_message ("/strip/solo", _strip->solo_control());
send_change_message (X_("/strip/solo"), _strip->solo_control());
if (_strip->solo_isolate_control()) {
_strip->solo_isolate_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/strip/solo_iso"), _strip->solo_isolate_control()), OSC::instance());
send_change_message ("/strip/solo_iso", _strip->solo_isolate_control());
send_change_message (X_("/strip/solo_iso"), _strip->solo_isolate_control());
}
if (_strip->solo_safe_control()) {
_strip->solo_safe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/strip/solo_safe"), _strip->solo_safe_control()), OSC::instance());
send_change_message ("/strip/solo_safe", _strip->solo_safe_control());
send_change_message (X_("/strip/solo_safe"), _strip->solo_safe_control());
}
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (_strip);
@@ -163,12 +163,12 @@ OSCRouteObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip,
boost::shared_ptr<AutomationControl> rec_controllable = _strip->rec_enable_control ();
if (rec_controllable) {
rec_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/recenable"), _strip->rec_enable_control()), OSC::instance());
send_change_message ("/strip/recenable", _strip->rec_enable_control());
send_change_message (X_("/strip/recenable"), _strip->rec_enable_control());
}
boost::shared_ptr<AutomationControl> recsafe_controllable = _strip->rec_safe_control ();
if (rec_controllable) {
recsafe_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/record_safe"), _strip->rec_safe_control()), OSC::instance());
send_change_message ("/strip/record_safe", _strip->rec_safe_control());
send_change_message (X_("/strip/record_safe"), _strip->rec_safe_control());
}
_strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_select_status, this, _1), OSC::instance());
send_select_status (ARDOUR::Properties::selected);
@@ -189,7 +189,7 @@ OSCRouteObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip,
boost::shared_ptr<Controllable> pan_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_azimuth_control());
if (pan_controllable) {
pan_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/pan_stereo_position"), _strip->pan_azimuth_control()), OSC::instance());
send_change_message ("/strip/pan_stereo_position", _strip->pan_azimuth_control());
send_change_message (X_("/strip/pan_stereo_position"), _strip->pan_azimuth_control());
}
}
_init = false;
@@ -203,9 +203,9 @@ OSCRouteObserver::set_expand (uint32_t expand)
if (expand != _expand) {
_expand = expand;
if (expand == ssid) {
_osc.float_message_with_id ("/strip/expand", ssid, 1.0, in_line, addr);
_osc.float_message_with_id (X_("/strip/expand"), ssid, 1.0, in_line, addr);
} else {
_osc.float_message_with_id ("/strip/expand", ssid, 0.0, in_line, addr);
_osc.float_message_with_id (X_("/strip/expand"), ssid, 0.0, in_line, addr);
}
}
}
@@ -217,19 +217,19 @@ OSCRouteObserver::set_link_ready (uint32_t not_ready)
clear_strip ();
switch (ssid) {
case 1:
_osc.text_message_with_id ("/strip/name", ssid, "Device", in_line, addr);
_osc.text_message_with_id (X_("/strip/name"), ssid, "Device", in_line, addr);
break;
case 2:
_osc.text_message_with_id ("/strip/name", ssid, string_compose ("%1", not_ready), in_line, addr);
_osc.text_message_with_id (X_("/strip/name"), ssid, string_compose ("%1", not_ready), in_line, addr);
break;
case 3:
_osc.text_message_with_id ("/strip/name", ssid, "Missing", in_line, addr);
_osc.text_message_with_id (X_("/strip/name"), ssid, "Missing", in_line, addr);
break;
case 4:
_osc.text_message_with_id ("/strip/name", ssid, "from", in_line, addr);
_osc.text_message_with_id (X_("/strip/name"), ssid, "from", in_line, addr);
break;
case 5:
_osc.text_message_with_id ("/strip/name", ssid, "Linkset", in_line, addr);
_osc.text_message_with_id (X_("/strip/name"), ssid, "Linkset", in_line, addr);
break;
default:
break;
@@ -247,39 +247,39 @@ OSCRouteObserver::clear_strip ()
strip_connections.drop_connections ();
// all strip buttons should be off and faders 0 and etc.
_osc.float_message_with_id ("/strip/expand", ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/expand"), ssid, 0, in_line, addr);
if (feedback[0]) { // buttons are separate feedback
_osc.text_message_with_id ("/strip/name", ssid, " ", in_line, addr);
_osc.text_message_with_id ("/strip/group/name", ssid, " ", in_line, addr);
_osc.float_message_with_id ("/strip/mute", ssid, 0, in_line, addr);
_osc.float_message_with_id ("/strip/solo", ssid, 0, in_line, addr);
_osc.float_message_with_id ("/strip/recenable", ssid, 0, in_line, addr);
_osc.float_message_with_id ("/strip/record_safe", ssid, 0, in_line, addr);
_osc.float_message_with_id ("/strip/monitor_input", ssid, 0, in_line, addr);
_osc.float_message_with_id ("/strip/monitor_disk", ssid, 0, in_line, addr);
_osc.float_message_with_id ("/strip/gui_select", ssid, 0, in_line, addr);
_osc.float_message_with_id ("/strip/select", ssid, 0, in_line, addr);
_osc.text_message_with_id (X_("/strip/name"), ssid, " ", in_line, addr);
_osc.text_message_with_id (X_("/strip/group/name"), ssid, " ", in_line, addr);
_osc.float_message_with_id (X_("/strip/mute"), ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/solo"), ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/recenable"), ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/record_safe"), ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/monitor_input"), ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/monitor_disk"), ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/gui_select"), ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/select"), ssid, 0, in_line, addr);
}
if (feedback[1]) { // level controls
if (gainmode) {
_osc.float_message_with_id ("/strip/fader", ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/fader"), ssid, 0, in_line, addr);
} else {
_osc.float_message_with_id ("/strip/gain", ssid, -193, in_line, addr);
_osc.float_message_with_id (X_("/strip/gain"), ssid, -193, in_line, addr);
}
_osc.float_message_with_id ("/strip/trimdB", ssid, 0, in_line, addr);
_osc.float_message_with_id ("/strip/pan_stereo_position", ssid, 0.5, in_line, addr);
_osc.float_message_with_id (X_("/strip/trimdB"), ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/pan_stereo_position"), ssid, 0.5, in_line, addr);
}
if (feedback[9]) {
_osc.float_message_with_id ("/strip/signal", ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/signal"), ssid, 0, in_line, addr);
}
if (feedback[7]) {
if (gainmode) {
_osc.float_message_with_id ("/strip/meter", ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/meter"), ssid, 0, in_line, addr);
} else {
_osc.float_message_with_id ("/strip/meter", ssid, -193, in_line, addr);
_osc.float_message_with_id (X_("/strip/meter"), ssid, -193, in_line, addr);
}
}else if (feedback[8]) {
_osc.float_message_with_id ("/strip/meter", ssid, 0, in_line, addr);
_osc.float_message_with_id (X_("/strip/meter"), ssid, 0, in_line, addr);
}
}
@@ -303,13 +303,13 @@ OSCRouteObserver::tick ()
if (_last_meter != now_meter) {
if (feedback[7] || feedback[8]) {
if (gainmode && feedback[7]) {
_osc.float_message_with_id ("/strip/meter", ssid, ((now_meter + 94) / 100), in_line, addr);
_osc.float_message_with_id (X_("/strip/meter"), ssid, ((now_meter + 94) / 100), in_line, addr);
} else if ((!gainmode) && feedback[7]) {
_osc.float_message_with_id ("/strip/meter", ssid, now_meter, in_line, addr);
_osc.float_message_with_id (X_("/strip/meter"), ssid, now_meter, in_line, addr);
} else if (feedback[8]) {
uint32_t ledlvl = (uint32_t)(((now_meter + 54) / 3.75)-1);
uint16_t ledbits = ~(0xfff<<ledlvl);
_osc.int_message_with_id ("/strip/meter", ssid, ledbits, in_line, addr);
_osc.int_message_with_id (X_("/strip/meter"), ssid, ledbits, in_line, addr);
}
}
if (feedback[9]) {
@@ -319,7 +319,7 @@ OSCRouteObserver::tick ()
} else {
signal = 1;
}
_osc.float_message_with_id ("/strip/signal", ssid, signal, in_line, addr);
_osc.float_message_with_id (X_("/strip/signal"), ssid, signal, in_line, addr);
}
}
_last_meter = now_meter;
@@ -328,7 +328,7 @@ OSCRouteObserver::tick ()
if (feedback[1]) {
if (gain_timeout) {
if (gain_timeout == 1) {
_osc.text_message_with_id ("/strip/name", ssid, _strip->name(), in_line, addr);
_osc.text_message_with_id (X_("/strip/name"), ssid, _strip->name(), in_line, addr);
}
gain_timeout--;
}
@@ -350,7 +350,7 @@ OSCRouteObserver::name_changed (const PBD::PropertyChange& what_changed)
}
if (_strip) {
_osc.text_message_with_id ("/strip/name", ssid, _strip->name(), in_line, addr);
_osc.text_message_with_id (X_("/strip/name"), ssid, _strip->name(), in_line, addr);
}
}
@@ -361,16 +361,16 @@ OSCRouteObserver::group_name ()
RouteGroup *rg = rt->route_group();
if (rg) {
_osc.text_message_with_id ("/strip/group/name", ssid, rg->name(), in_line, addr);
_osc.text_message_with_id (X_("/strip/group/name"), ssid, rg->name(), in_line, addr);
} else {
_osc.text_message_with_id ("/strip/group/name", ssid, " ", in_line, addr);
_osc.text_message_with_id (X_("/strip/group/name"), ssid, " ", in_line, addr);
}
}
void
OSCRouteObserver::pi_changed (PBD::PropertyChange const& what_changed)
{
_osc.int_message_with_id ("/strip/hide", ssid, _strip->is_hidden (), in_line, addr);
_osc.int_message_with_id (X_("/strip/hide"), ssid, _strip->is_hidden (), in_line, addr);
}
void
@@ -402,8 +402,8 @@ OSCRouteObserver::send_monitor_status (boost::shared_ptr<Controllable> controlla
disk = 0;
input = 0;
}
_osc.int_message_with_id ("/strip/monitor_input", ssid, input, in_line, addr);
_osc.int_message_with_id ("/strip/monitor_disk", ssid, disk, in_line, addr);
_osc.int_message_with_id (X_("/strip/monitor_input"), ssid, input, in_line, addr);
_osc.int_message_with_id (X_("/strip/monitor_disk"), ssid, disk, in_line, addr);
}
@@ -415,7 +415,7 @@ OSCRouteObserver::send_trim_message ()
} else {
return;
}
_osc.float_message_with_id ("/strip/trimdB", ssid, (float) accurate_coefficient_to_dB (_last_trim), in_line, addr);
_osc.float_message_with_id (X_("/strip/trimdB"), ssid, (float) accurate_coefficient_to_dB (_last_trim), in_line, addr);
}
void
@@ -429,17 +429,17 @@ OSCRouteObserver::send_gain_message ()
}
if (gainmode) {
_osc.float_message_with_id ("/strip/fader", ssid, controllable->internal_to_interface (_last_gain), in_line, addr);
_osc.float_message_with_id (X_("/strip/fader"), ssid, controllable->internal_to_interface (_last_gain), in_line, addr);
if (gainmode == 1) {
_osc.text_message_with_id ("/strip/name", ssid, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), in_line, addr);
_osc.text_message_with_id (X_("/strip/name"), ssid, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), in_line, addr);
gain_timeout = 8;
}
}
if (!gainmode || gainmode == 2) {
if (controllable->get_value() < 1e-15) {
_osc.float_message_with_id ("/strip/gain", ssid, -200, in_line, addr);
_osc.float_message_with_id (X_("/strip/gain"), ssid, -200, in_line, addr);
} else {
_osc.float_message_with_id ("/strip/gain", ssid, accurate_coefficient_to_dB (_last_gain), in_line, addr);
_osc.float_message_with_id (X_("/strip/gain"), ssid, accurate_coefficient_to_dB (_last_gain), in_line, addr);
}
}
}
@@ -447,9 +447,9 @@ OSCRouteObserver::send_gain_message ()
void
OSCRouteObserver::gain_automation ()
{
string path = "/strip/gain";
string path = X_("/strip/gain");
if (gainmode) {
path = "/strip/fader";
path = X_("/strip/fader");
}
send_gain_message ();
as = _strip->gain_control()->alist()->automation_state();
@@ -479,8 +479,8 @@ OSCRouteObserver::gain_automation ()
default:
break;
}
_osc.float_message_with_id (string_compose ("%1/automation", path), ssid, output, in_line, addr);
_osc.text_message_with_id (string_compose ("%1/automation_name", path), ssid, auto_name, in_line, addr);
_osc.float_message_with_id (string_compose (X_("%1/automation"), path), ssid, output, in_line, addr);
_osc.text_message_with_id (string_compose (X_("%1/automation_name"), path), ssid, auto_name, in_line, addr);
}
void
@@ -488,7 +488,7 @@ OSCRouteObserver::send_select_status (const PropertyChange& what)
{
if (what == PropertyChange(ARDOUR::Properties::selected)) {
if (_strip) {
_osc.float_message_with_id ("/strip/select", ssid, _strip->is_selected(), in_line, addr);
_osc.float_message_with_id (X_("/strip/select"), ssid, _strip->is_selected(), in_line, addr);
}
}
}

246
libs/surfaces/osc/osc_select_observer.cc
View File

@@ -139,22 +139,22 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip
group_name ();
_strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::pi_changed, this, _1), OSC::instance());
_osc.float_message ("/select/hide", _strip->is_hidden (), addr);
_osc.float_message (X_("/select/hide"), _strip->is_hidden (), addr);
_strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/mute"), _strip->mute_control()), OSC::instance());
change_message ("/select/mute", _strip->mute_control());
change_message (X_("/select/mute"), _strip->mute_control());
_strip->solo_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo"), _strip->solo_control()), OSC::instance());
change_message ("/select/solo", _strip->solo_control());
change_message (X_("/select/solo"), _strip->solo_control());
if (_strip->solo_isolate_control()) {
_strip->solo_isolate_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_iso"), _strip->solo_isolate_control()), OSC::instance());
change_message ("/select/solo_iso", _strip->solo_isolate_control());
change_message (X_("/select/solo_iso"), _strip->solo_isolate_control());
}
if (_strip->solo_safe_control()) {
_strip->solo_safe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_safe"), _strip->solo_safe_control()), OSC::instance());
change_message ("/select/solo_safe", _strip->solo_safe_control());
change_message (X_("/select/solo_safe"), _strip->solo_safe_control());
}
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (_strip);
@@ -166,19 +166,19 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip
boost::shared_ptr<AutomationControl> rec_controllable = _strip->rec_enable_control ();
if (rec_controllable) {
rec_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/recenable"), _strip->rec_enable_control()), OSC::instance());
change_message ("/select/recenable", _strip->rec_enable_control());
change_message (X_("/select/recenable"), _strip->rec_enable_control());
}
boost::shared_ptr<AutomationControl> recsafe_controllable = _strip->rec_safe_control ();
if (recsafe_controllable) {
recsafe_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/record_safe"), _strip->rec_safe_control()), OSC::instance());
change_message ("/select/record_safe", _strip->rec_safe_control());
change_message (X_("/select/record_safe"), _strip->rec_safe_control());
}
boost::shared_ptr<AutomationControl> phase_controllable = _strip->phase_control ();
if (phase_controllable) {
phase_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/polarity"), _strip->phase_control()), OSC::instance());
change_message ("/select/polarity", _strip->phase_control());
change_message (X_("/select/polarity"), _strip->phase_control());
}
_strip->gain_control()->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_automation, this), OSC::instance());
@@ -188,33 +188,33 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip
boost::shared_ptr<Controllable> trim_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->trim_control());
if (trim_controllable) {
trim_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::trim_message, this, X_("/select/trimdB"), _strip->trim_control()), OSC::instance());
trim_message ("/select/trimdB", _strip->trim_control());
trim_message (X_("/select/trimdB"), _strip->trim_control());
}
boost::shared_ptr<Controllable> pan_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_azimuth_control());
if (pan_controllable) {
pan_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_stereo_position"), _strip->pan_azimuth_control()), OSC::instance());
change_message ("/select/pan_stereo_position", _strip->pan_azimuth_control());
change_message (X_("/select/pan_stereo_position"), _strip->pan_azimuth_control());
}
boost::shared_ptr<Controllable> width_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_width_control());
if (width_controllable) {
width_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_stereo_width"), _strip->pan_width_control()), OSC::instance());
change_message ("/select/pan_stereo_width", _strip->pan_width_control());
change_message (X_("/select/pan_stereo_width"), _strip->pan_width_control());
}
// Rest of possible pan controls... Untested because I can't find a way to get them in the GUI :)
if (_strip->pan_elevation_control ()) {
_strip->pan_elevation_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_elevation_position"), _strip->pan_elevation_control()), OSC::instance());
change_message ("/select/pan_elevation_position", _strip->pan_elevation_control());
change_message (X_("/select/pan_elevation_position"), _strip->pan_elevation_control());
}
if (_strip->pan_frontback_control ()) {
_strip->pan_frontback_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_frontback_position"), _strip->pan_frontback_control()), OSC::instance());
change_message ("/select/pan_frontback_position", _strip->pan_frontback_control());
change_message (X_("/select/pan_frontback_position"), _strip->pan_frontback_control());
}
if (_strip->pan_lfe_control ()) {
_strip->pan_lfe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_lfe_control"), _strip->pan_lfe_control()), OSC::instance());
change_message ("/select/pan_lfe_control", _strip->pan_lfe_control());
change_message (X_("/select/pan_lfe_control"), _strip->pan_lfe_control());
}
// sends, plugins and eq
@@ -223,21 +223,21 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip
// but... MB master send enable is different
if (_strip->master_send_enable_controllable ()) {
_strip->master_send_enable_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/master_send_enable"), _strip->master_send_enable_controllable()), OSC::instance());
enable_message ("/select/master_send_enable", _strip->master_send_enable_controllable());
enable_message (X_("/select/master_send_enable"), _strip->master_send_enable_controllable());
}
// Compressor
if (_strip->comp_enable_controllable ()) {
_strip->comp_enable_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/comp_enable"), _strip->comp_enable_controllable()), OSC::instance());
enable_message ("/select/comp_enable", _strip->comp_enable_controllable());
enable_message (X_("/select/comp_enable"), _strip->comp_enable_controllable());
}
if (_strip->comp_threshold_controllable ()) {
_strip->comp_threshold_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_threshold"), _strip->comp_threshold_controllable()), OSC::instance());
change_message ("/select/comp_threshold", _strip->comp_threshold_controllable());
change_message (X_("/select/comp_threshold"), _strip->comp_threshold_controllable());
}
if (_strip->comp_speed_controllable ()) {
_strip->comp_speed_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_speed"), _strip->comp_speed_controllable()), OSC::instance());
change_message ("/select/comp_speed", _strip->comp_speed_controllable());
change_message (X_("/select/comp_speed"), _strip->comp_speed_controllable());
}
if (_strip->comp_mode_controllable ()) {
_strip->comp_mode_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::comp_mode, this), OSC::instance());
@@ -245,7 +245,7 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip
}
if (_strip->comp_makeup_controllable ()) {
_strip->comp_makeup_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_makeup"), _strip->comp_makeup_controllable()), OSC::instance());
change_message ("/select/comp_makeup", _strip->comp_makeup_controllable());
change_message (X_("/select/comp_makeup"), _strip->comp_makeup_controllable());
}
renew_sends ();
renew_plugin ();
@@ -261,9 +261,9 @@ OSCSelectObserver::set_expand (uint32_t expand)
if (expand != _expand) {
_expand = expand;
if (expand) {
_osc.float_message ("/select/expand", 1.0, addr);
_osc.float_message (X_("/select/expand"), 1.0, addr);
} else {
_osc.float_message ("/select/expand", 0.0, addr);
_osc.float_message (X_("/select/expand"), 0.0, addr);
}
}
}
@@ -274,50 +274,50 @@ OSCSelectObserver::clear_observer ()
_init = true;
strip_connections.drop_connections ();
// all strip buttons should be off and faders 0 and etc.
_osc.float_message ("/select/expand", 0, addr);
_osc.text_message ("/select/name", " ", addr);
_osc.text_message ("/select/group/name", " ", addr);
_osc.text_message ("/select/comment", " ", addr);
_osc.float_message ("/select/mute", 0, addr);
_osc.float_message ("/select/solo", 0, addr);
_osc.float_message ("/select/recenable", 0, addr);
_osc.float_message ("/select/record_safe", 0, addr);
_osc.float_message ("/select/monitor_input", 0, addr);
_osc.float_message ("/select/monitor_disk", 0, addr);
_osc.float_message ("/select/polarity", 0, addr);
_osc.float_message ("/select/n_inputs", 0, addr);
_osc.float_message ("/select/n_outputs", 0, addr);
_osc.float_message (X_("/select/expand"), 0, addr);
_osc.text_message (X_("/select/name"), " ", addr);
_osc.text_message (X_("/select/group/name"), " ", addr);
_osc.text_message (X_("/select/comment"), " ", addr);
_osc.float_message (X_("/select/mute"), 0, addr);
_osc.float_message (X_("/select/solo"), 0, addr);
_osc.float_message (X_("/select/recenable"), 0, addr);
_osc.float_message (X_("/select/record_safe"), 0, addr);
_osc.float_message (X_("/select/monitor_input"), 0, addr);
_osc.float_message (X_("/select/monitor_disk"), 0, addr);
_osc.float_message (X_("/select/polarity"), 0, addr);
_osc.float_message (X_("/select/n_inputs"), 0, addr);
_osc.float_message (X_("/select/n_outputs"), 0, addr);
if (gainmode) {
_osc.float_message ("/select/fader", 0, addr);
_osc.float_message (X_("/select/fader"), 0, addr);
} else {
_osc.float_message ("/select/gain", -193, addr);
_osc.float_message (X_("/select/gain"), -193, addr);
}
_osc.float_message ("/select/trimdB", 0, addr);
_osc.float_message ("/select/pan_stereo_position", 0.5, addr);
_osc.float_message ("/select/pan_stereo_width", 1, addr);
_osc.float_message (X_("/select/trimdB"), 0, addr);
_osc.float_message (X_("/select/pan_stereo_position"), 0.5, addr);
_osc.float_message (X_("/select/pan_stereo_width"), 1, addr);
if (feedback[9]) {
_osc.float_message ("/select/signal", 0, addr);
_osc.float_message (X_("/select/signal"), 0, addr);
}
if (feedback[7]) {
if (gainmode) {
_osc.float_message ("/select/meter", 0, addr);
_osc.float_message (X_("/select/meter"), 0, addr);
} else {
_osc.float_message ("/select/meter", -193, addr);
_osc.float_message (X_("/select/meter"), -193, addr);
}
}else if (feedback[8]) {
_osc.float_message ("/select/meter", 0, addr);
_osc.float_message (X_("/select/meter"), 0, addr);
}
_osc.float_message ("/select/pan_elevation_position", 0, addr);
_osc.float_message ("/select/pan_frontback_position", .5, addr);
_osc.float_message ("/select/pan_lfe_control", 0, addr);
_osc.float_message ("/select/comp_enable", 0, addr);
_osc.float_message ("/select/comp_threshold", 0, addr);
_osc.float_message ("/select/comp_speed", 0, addr);
_osc.float_message ("/select/comp_mode", 0, addr);
_osc.text_message ("/select/comp_mode_name", " ", addr);
_osc.text_message ("/select/comp_speed_name", " ", addr);
_osc.float_message ("/select/comp_makeup", 0, addr);
_osc.float_message ("/select/expand", 0.0, addr);
_osc.float_message (X_("/select/pan_elevation_position"), 0, addr);
_osc.float_message (X_("/select/pan_frontback_position"), .5, addr);
_osc.float_message (X_("/select/pan_lfe_control"), 0, addr);
_osc.float_message (X_("/select/comp_enable"), 0, addr);
_osc.float_message (X_("/select/comp_threshold"), 0, addr);
_osc.float_message (X_("/select/comp_speed"), 0, addr);
_osc.float_message (X_("/select/comp_mode"), 0, addr);
_osc.text_message (X_("/select/comp_mode_name"), " ", addr);
_osc.text_message (X_("/select/comp_speed_name"), " ", addr);
_osc.float_message (X_("/select/comp_makeup"), 0, addr);
_osc.float_message (X_("/select/expand"), 0.0, addr);
send_end();
plugin_end();
eq_end();
@@ -374,28 +374,28 @@ OSCSelectObserver::send_init()
send_valid = true;
} else {
send_gain (c, _strip->send_level_controllable(s));
_osc.float_message_with_id ("/select/send_enable", c, 0, in_line, addr);
_osc.text_message_with_id ("/select/send_name", c, " ", in_line, addr);
_osc.float_message_with_id (X_("/select/send_enable"), c, 0, in_line, addr);
_osc.text_message_with_id (X_("/select/send_name"), c, " ", in_line, addr);
}
if (_strip->send_enable_controllable (s)) {
_strip->send_enable_controllable(s)->Changed.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message_with_id, this, X_("/select/send_enable"), c, _strip->send_enable_controllable(s)), OSC::instance());
enable_message_with_id ("/select/send_enable", c, _strip->send_enable_controllable(s));
enable_message_with_id (X_("/select/send_enable"), c, _strip->send_enable_controllable(s));
} else if (send_valid) {
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (_strip);
if (!r) {
// should never get here
_osc.float_message_with_id ("/select/send_enable", c, 0, in_line, addr);
_osc.float_message_with_id (X_("/select/send_enable"), c, 0, in_line, addr);
}
boost::shared_ptr<Send> snd = boost::dynamic_pointer_cast<Send> (r->nth_send(s));
if (snd) {
boost::shared_ptr<Processor> proc = boost::dynamic_pointer_cast<Processor> (snd);
proc->ActiveChanged.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_enable, this, X_("/select/send_enable"), c, proc), OSC::instance());
_osc.float_message_with_id ("/select/send_enable", c, proc->enabled(), in_line, addr);
_osc.float_message_with_id (X_("/select/send_enable"), c, proc->enabled(), in_line, addr);
}
}
if ((gainmode != 1) && send_valid) {
_osc.text_message_with_id ("/select/send_name", c, _strip->send_name(s), in_line, addr);
_osc.text_message_with_id (X_("/select/send_name"), c, _strip->send_name(s), in_line, addr);
}
}
}
@@ -406,14 +406,14 @@ OSCSelectObserver::send_end ()
send_connections.drop_connections ();
for (uint32_t i = 1; i <= send_size; i++) {
if (gainmode) {
_osc.float_message_with_id ("/select/send_fader", i, 0, in_line, addr);
_osc.float_message_with_id (X_("/select/send_fader"), i, 0, in_line, addr);
} else {
_osc.float_message_with_id ("/select/send_gain", i, -193, in_line, addr);
_osc.float_message_with_id (X_("/select/send_gain"), i, -193, in_line, addr);
}
// next enable
_osc.float_message_with_id ("/select/send_enable", i, 0, in_line, addr);
_osc.float_message_with_id (X_("/select/send_enable"), i, 0, in_line, addr);
// next name
_osc.text_message_with_id ("/select/send_name", i, " ", in_line, addr);
_osc.text_message_with_id (X_("/select/send_name"), i, " ", in_line, addr);
}
// need to delete or clear send_timeout
send_size = 0;
@@ -471,7 +471,7 @@ OSCSelectObserver::plugin_init()
boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
// we have a plugin we can ask if it is activated
proc->ActiveChanged.connect (plugin_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::plug_enable, this, X_("/select/plugin/activate"), proc), OSC::instance());
_osc.float_message ("/select/plugin/activate", proc->enabled(), addr);
_osc.float_message (X_("/select/plugin/activate"), proc->enabled(), addr);
bool ok = false;
// put only input controls into a vector
@@ -493,15 +493,15 @@ OSCSelectObserver::plugin_init()
if (plug_page_size) {
plug_size = plug_page_size;
}
_osc.text_message ("/select/plugin/name", pip->name(), addr);
_osc.text_message (X_("/select/plugin/name"), pip->name(), addr);
uint32_t page_start = plug_page - 1;
uint32_t page_end = page_start + plug_size;
int pid = 1;
for ( uint32_t ppi = page_start; ppi < page_end; ++ppi, ++pid) {
if (ppi >= nplug_params) {
_osc.text_message_with_id ("/select/plugin/parameter/name", pid, " ", in_line, addr);
_osc.float_message_with_id ("/select/plugin/parameter", pid, 0, in_line, addr);
_osc.text_message_with_id (X_("/select/plugin/parameter/name"), pid, " ", in_line, addr);
_osc.float_message_with_id (X_("/select/plugin/parameter"), pid, 0, in_line, addr);
continue;
}
@@ -511,7 +511,7 @@ OSCSelectObserver::plugin_init()
}
ParameterDescriptor pd;
pip->get_parameter_descriptor(controlid, pd);
_osc.text_message_with_id ("/select/plugin/parameter/name", pid, pd.label, in_line, addr);
_osc.text_message_with_id (X_("/select/plugin/parameter/name"), pid, pd.label, in_line, addr);
if ( pip->parameter_is_input(controlid)) {
boost::shared_ptr<AutomationControl> c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid));
if (c) {
@@ -530,9 +530,9 @@ void
OSCSelectObserver::plugin_parameter_changed (int pid, bool swtch, boost::shared_ptr<PBD::Controllable> controllable)
{
if (swtch) {
enable_message_with_id ("/select/plugin/parameter", pid, controllable);
enable_message_with_id (X_("/select/plugin/parameter"), pid, controllable);
} else {
change_message_with_id ("/select/plugin/parameter", pid, controllable);
change_message_with_id (X_("/select/plugin/parameter"), pid, controllable);
}
}
@@ -540,12 +540,12 @@ void
OSCSelectObserver::plugin_end ()
{
plugin_connections.drop_connections ();
_osc.float_message ("/select/plugin/activate", 0, addr);
_osc.text_message ("/select/plugin/name", " ", addr);
_osc.float_message (X_("/select/plugin/activate"), 0, addr);
_osc.text_message (X_("/select/plugin/name"), " ", addr);
for (uint32_t i = 1; i <= plug_size; i++) {
_osc.float_message_with_id ("/select/plugin/parameter", i, 0, in_line, addr);
_osc.float_message_with_id (X_("/select/plugin/parameter"), i, 0, in_line, addr);
// next name
_osc.text_message_with_id ("/select/plugin/parameter/name", i, " ", in_line, addr);
_osc.text_message_with_id (X_("/select/plugin/parameter/name"), i, " ", in_line, addr);
}
plug_size = 0;
nplug_params = 0;
@@ -568,7 +568,7 @@ OSCSelectObserver::tick ()
if (now_meter < -144) now_meter = -193;
if (_last_meter != now_meter) {
if (feedback[7] || feedback[8]) {
string path = "/select/meter";
string path = X_("/select/meter");
if (gainmode && feedback[7]) {
_osc.float_message (path, ((now_meter + 94) / 100), addr);
} else if ((!gainmode) && feedback[7]) {
@@ -580,7 +580,7 @@ OSCSelectObserver::tick ()
}
}
if (feedback[9]) {
string path = "/select/signal";
string path = X_("/select/signal");
float signal;
if (now_meter < -40) {
signal = 0;
@@ -595,7 +595,7 @@ OSCSelectObserver::tick ()
}
if (gain_timeout) {
if (gain_timeout == 1) {
_osc.text_message ("/select/name", _strip->name(), addr);
_osc.text_message (X_("/select/name"), _strip->name(), addr);
}
gain_timeout--;
}
@@ -609,7 +609,7 @@ OSCSelectObserver::tick ()
if (_strip->comp_redux_controllable() && _strip->comp_enable_controllable() && _strip->comp_enable_controllable()->get_value()) {
float new_value = _strip->comp_redux_controllable()->get_parameter();
if (_comp_redux != new_value) {
_osc.float_message ("/select/comp_redux", new_value, addr);
_osc.float_message (X_("/select/comp_redux"), new_value, addr);
_comp_redux = new_value;
}
}
@@ -617,7 +617,7 @@ OSCSelectObserver::tick ()
if (send_timeout[i]) {
if (send_timeout[i] == 1) {
uint32_t pg_offset = (send_page - 1) * send_page_size;
_osc.text_message_with_id ("/select/send_name", i, _strip->send_name(pg_offset + i - 1), in_line, addr);
_osc.text_message_with_id (X_("/select/send_name"), i, _strip->send_name(pg_offset + i - 1), in_line, addr);
}
send_timeout[i]--;
}
@@ -636,15 +636,15 @@ OSCSelectObserver::name_changed (const PBD::PropertyChange& what_changed)
return;
}
_osc.text_message ("/select/name", _strip->name(), addr);
_osc.text_message (X_("/select/name"), _strip->name(), addr);
boost::shared_ptr<Route> route = boost::dynamic_pointer_cast<Route> (_strip);
if (route) {
//spit out the comment at the same time
_osc.text_message ("/select/comment", route->comment(), addr);
_osc.text_message (X_("/select/comment"), route->comment(), addr);
// lets tell the surface how many inputs this strip has
_osc.float_message ("/select/n_inputs", (float) route->n_inputs().n_total(), addr);
_osc.float_message (X_("/select/n_inputs"), (float) route->n_inputs().n_total(), addr);
// lets tell the surface how many outputs this strip has
_osc.float_message ("/select/n_outputs", (float) route->n_outputs().n_total(), addr);
_osc.float_message (X_("/select/n_outputs"), (float) route->n_outputs().n_total(), addr);
}
}
@@ -655,16 +655,16 @@ OSCSelectObserver::group_name ()
RouteGroup *rg = rt->route_group();
if (rg) {
_osc.text_message ("/select/group/name", rg->name(), addr);
_osc.text_message (X_("/select/group/name"), rg->name(), addr);
} else {
_osc.text_message ("/select/group/name", " ", addr);
_osc.text_message (X_("/select/group/name"), " ", addr);
}
}
void
OSCSelectObserver::pi_changed (PBD::PropertyChange const& what_changed)
{
_osc.float_message ("/select/hide", _strip->is_hidden (), addr);
_osc.float_message (X_("/select/hide"), _strip->is_hidden (), addr);
}
void
@@ -734,8 +734,8 @@ OSCSelectObserver::monitor_status (boost::shared_ptr<Controllable> controllable)
input = 0;
}
_osc.float_message ("/select/monitor_input", (float) input, addr);
_osc.float_message ("/select/monitor_disk", (float) disk, addr);
_osc.float_message (X_("/select/monitor_input"), (float) input, addr);
_osc.float_message (X_("/select/monitor_disk"), (float) disk, addr);
}
void
@@ -761,17 +761,17 @@ OSCSelectObserver::gain_message ()
}
if (gainmode) {
_osc.float_message ("/select/fader", _strip->gain_control()->internal_to_interface (value), addr);
_osc.float_message (X_("/select/fader"), _strip->gain_control()->internal_to_interface (value), addr);
if (gainmode == 1) {
_osc.text_message ("/select/name", string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (value)), addr);
_osc.text_message (X_("/select/name"), string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (value)), addr);
gain_timeout = 8;
}
}
if (!gainmode || gainmode == 2) {
if (value < 1e-15) {
_osc.float_message ("/select/gain", -200, addr);
_osc.float_message (X_("/select/gain"), -200, addr);
} else {
_osc.float_message ("/select/gain", accurate_coefficient_to_dB (value), addr);
_osc.float_message (X_("/select/gain"), accurate_coefficient_to_dB (value), addr);
}
}
}
@@ -804,11 +804,11 @@ OSCSelectObserver::gain_automation ()
}
if (gainmode) {
_osc.float_message ("/select/fader/automation", output, addr);
_osc.text_message ("/select/fader/automation_name", auto_name, addr);
_osc.float_message (X_("/select/fader/automation"), output, addr);
_osc.text_message (X_("/select/fader/automation_name"), auto_name, addr);
} else {
_osc.float_message ("/select/gain/automation", output, addr);
_osc.text_message ("/select/gain/automation_name", auto_name, addr);
_osc.float_message (X_("/select/gain/automation"), output, addr);
_osc.text_message (X_("/select/gain/automation_name"), auto_name, addr);
}
gain_message ();
@@ -847,16 +847,16 @@ OSCSelectObserver::send_gain (uint32_t id, boost::shared_ptr<PBD::Controllable>
if (controllable) {
value = controllable->internal_to_interface (raw_value);
}
_osc.float_message_with_id ("/select/send_fader", id, value, in_line, addr);
_osc.float_message_with_id (X_("/select/send_fader"), id, value, in_line, addr);
if (gainmode == 1) {
_osc.text_message_with_id ("/select/send_name" , id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), db), in_line, addr);
_osc.text_message_with_id (X_("/select/send_name") , id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), db), in_line, addr);
if (send_timeout.size() > id) {
send_timeout[id] = 8;
}
}
}
if (!gainmode || gainmode == 2) {
_osc.float_message_with_id ("/select/send_gain", id, db, in_line, addr);
_osc.float_message_with_id (X_("/select/send_gain"), id, db, in_line, addr);
}
}
@@ -867,15 +867,15 @@ OSCSelectObserver::send_enable (string path, uint32_t id, boost::shared_ptr<Proc
// with no delay value is wrong
Glib::usleep(10);
_osc.float_message_with_id ("/select/send_enable", id, proc->enabled(), in_line, addr);
_osc.float_message_with_id (X_("/select/send_enable"), id, proc->enabled(), in_line, addr);
}
void
OSCSelectObserver::comp_mode ()
{
change_message ("/select/comp_mode", _strip->comp_mode_controllable());
_osc.text_message ("/select/comp_mode_name", _strip->comp_mode_name(_strip->comp_mode_controllable()->get_value()), addr);
_osc.text_message ("/select/comp_speed_name", _strip->comp_speed_name(_strip->comp_mode_controllable()->get_value()), addr);
change_message (X_("/select/comp_mode"), _strip->comp_mode_controllable());
_osc.text_message (X_("/select/comp_mode_name"), _strip->comp_mode_name(_strip->comp_mode_controllable()->get_value()), addr);
_osc.text_message (X_("/select/comp_speed_name"), _strip->comp_speed_name(_strip->comp_mode_controllable()->get_value()), addr);
}
void
@@ -884,37 +884,37 @@ OSCSelectObserver::eq_init()
// HPF and enable are special case, rest are in bands
if (_strip->filter_enable_controllable (true)) {
_strip->filter_enable_controllable (true)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf/enable"), _strip->filter_enable_controllable (true)), OSC::instance());
change_message ("/select/eq_hpf/enable", _strip->filter_enable_controllable(true));
change_message (X_("/select/eq_hpf/enable"), _strip->filter_enable_controllable(true));
}
if (_strip->filter_enable_controllable (false)) {
_strip->filter_enable_controllable (false)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_lpf/enable"), _strip->filter_enable_controllable (false)), OSC::instance());
change_message ("/select/eq_lpf/enable", _strip->filter_enable_controllable(false));
change_message (X_("/select/eq_lpf/enable"), _strip->filter_enable_controllable(false));
}
if (_strip->filter_freq_controllable (true)) {
_strip->filter_freq_controllable (true)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf/freq"), _strip->filter_freq_controllable (true)), OSC::instance());
change_message ("/select/eq_hpf/freq", _strip->filter_freq_controllable(true));
change_message (X_("/select/eq_hpf/freq"), _strip->filter_freq_controllable(true));
}
if (_strip->filter_freq_controllable (false)) {
_strip->filter_freq_controllable (false)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_lpf/freq"), _strip->filter_freq_controllable (false)), OSC::instance());
change_message ("/select/eq_lpf/freq", _strip->filter_freq_controllable(false));
change_message (X_("/select/eq_lpf/freq"), _strip->filter_freq_controllable(false));
}
if (_strip->filter_slope_controllable (true)) {
_strip->filter_slope_controllable (true)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf/slope"), _strip->filter_slope_controllable (true)), OSC::instance());
change_message ("/select/eq_hpf/slope", _strip->filter_slope_controllable(true));
change_message (X_("/select/eq_hpf/slope"), _strip->filter_slope_controllable(true));
}
if (_strip->filter_slope_controllable (false)) {
_strip->filter_slope_controllable (false)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_lpf/slope"), _strip->filter_slope_controllable (false)), OSC::instance());
change_message ("/select/eq_lpf/slope", _strip->filter_slope_controllable(false));
change_message (X_("/select/eq_lpf/slope"), _strip->filter_slope_controllable(false));
}
if (_strip->eq_enable_controllable ()) {
_strip->eq_enable_controllable ()->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/eq_enable"), _strip->eq_enable_controllable()), OSC::instance());
enable_message ("/select/eq_enable", _strip->eq_enable_controllable());
enable_message (X_("/select/eq_enable"), _strip->eq_enable_controllable());
}
eq_bands = _strip->eq_band_cnt ();
@@ -927,23 +927,23 @@ OSCSelectObserver::eq_init()
for (int i = 0; i < eq_bands; i++) {
if (_strip->eq_band_name(i).size()) {
_osc.text_message_with_id ("/select/eq_band_name", i + 1, _strip->eq_band_name (i), in_line, addr);
_osc.text_message_with_id (X_("/select/eq_band_name"), i + 1, _strip->eq_band_name (i), in_line, addr);
}
if (_strip->eq_gain_controllable (i)) {
_strip->eq_gain_controllable(i)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message_with_id, this, X_("/select/eq_gain"), i + 1, _strip->eq_gain_controllable(i)), OSC::instance());
change_message_with_id ("/select/eq_gain", i + 1, _strip->eq_gain_controllable(i));
change_message_with_id (X_("/select/eq_gain"), i + 1, _strip->eq_gain_controllable(i));
}
if (_strip->eq_freq_controllable (i)) {
_strip->eq_freq_controllable(i)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message_with_id, this, X_("/select/eq_freq"), i + 1, _strip->eq_freq_controllable(i)), OSC::instance());
change_message_with_id ("/select/eq_freq", i + 1, _strip->eq_freq_controllable(i));
change_message_with_id (X_("/select/eq_freq"), i + 1, _strip->eq_freq_controllable(i));
}
if (_strip->eq_q_controllable (i)) {
_strip->eq_q_controllable(i)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message_with_id, this, X_("/select/eq_q"), i + 1, _strip->eq_q_controllable(i)), OSC::instance());
change_message_with_id ("/select/eq_q", i + 1, _strip->eq_q_controllable(i));
change_message_with_id (X_("/select/eq_q"), i + 1, _strip->eq_q_controllable(i));
}
if (_strip->eq_shape_controllable (i)) {
_strip->eq_shape_controllable(i)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message_with_id, this, X_("/select/eq_shape"), i + 1, _strip->eq_shape_controllable(i)), OSC::instance());
change_message_with_id ("/select/eq_shape", i + 1, _strip->eq_shape_controllable(i));
change_message_with_id (X_("/select/eq_shape"), i + 1, _strip->eq_shape_controllable(i));
}
}
}
@@ -952,15 +952,15 @@ void
OSCSelectObserver::eq_end ()
{
eq_connections.drop_connections ();
_osc.float_message ("/select/eq_hpf", 0, addr);
_osc.float_message ("/select/eq_enable", 0, addr);
_osc.float_message (X_("/select/eq_hpf"), 0, addr);
_osc.float_message (X_("/select/eq_enable"), 0, addr);
for (int i = 1; i <= eq_bands; i++) {
_osc.text_message_with_id ("/select/eq_band_name", i, " ", in_line, addr);
_osc.float_message_with_id ("/select/eq_gain", i, 0, in_line, addr);
_osc.float_message_with_id ("/select/eq_freq", i, 0, in_line, addr);
_osc.float_message_with_id ("/select/eq_q", i, 0, in_line, addr);
_osc.float_message_with_id ("/select/eq_shape", i, 0, in_line, addr);
_osc.text_message_with_id (X_("/select/eq_band_name"), i, " ", in_line, addr);
_osc.float_message_with_id (X_("/select/eq_gain"), i, 0, in_line, addr);
_osc.float_message_with_id (X_("/select/eq_freq"), i, 0, in_line, addr);
_osc.float_message_with_id (X_("/select/eq_q"), i, 0, in_line, addr);
_osc.float_message_with_id (X_("/select/eq_shape"), i, 0, in_line, addr);
}