X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc_global_observer.cc;h=0917ce3761e7b10272853e874a39b00fe8817536;hb=cc78d78390f71a4c55e53f80d91ec235da288ac2;hp=b6c2170b1d91a2d199156efd6525bca2ac07bb56;hpb=e6311190921b7b3cb64f3750cdd1035b4afc866f;p=ardour.git diff --git a/libs/surfaces/osc/osc_global_observer.cc b/libs/surfaces/osc/osc_global_observer.cc index b6c2170b1d..0917ce3761 100644 --- a/libs/surfaces/osc/osc_global_observer.cc +++ b/libs/surfaces/osc/osc_global_observer.cc @@ -19,9 +19,13 @@ #include "boost/lambda/lambda.hpp" +#include "pbd/control_math.h" + +#include "ardour/amp.h" #include "ardour/session.h" #include "ardour/dB.h" #include "ardour/meter.h" +#include "ardour/monitor_processor.h" #include "osc.h" #include "osc_global_observer.h" @@ -33,13 +37,24 @@ using namespace PBD; using namespace ARDOUR; using namespace ArdourSurface; -OSCGlobalObserver::OSCGlobalObserver (Session& s, lo_address a, uint32_t gm, std::bitset<32> fb) - : gainmode (gm) - ,feedback (fb) +OSCGlobalObserver::OSCGlobalObserver (OSC& o, Session& s, ArdourSurface::OSC::OSCSurface* su) + : _osc (o) + ,sur (su) + ,_init (true) + ,_last_master_gain (0.0) + ,_last_master_trim (0.0) + ,_last_monitor_gain (0.0) + ,_jog_mode (1024) + ,last_punchin (4) + ,last_punchout (4) + ,last_click (4) { - addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a)); + addr = lo_address_new_from_url (sur->remote_url.c_str()); session = &s; - _last_frame = -1; + gainmode = sur->gainmode; + feedback = sur->feedback; + uint32_t jogmode = sur->jogmode; + _last_sample = -1; if (feedback[4]) { // connect to all the things we want to send feed back from @@ -50,101 +65,171 @@ OSCGlobalObserver::OSCGlobalObserver (Session& s, lo_address a, uint32_t gm, std */ // Master channel first + _osc.text_message (X_("/master/name"), "Master", addr); boost::shared_ptr strip = session->master_out(); boost::shared_ptr mute_controllable = boost::dynamic_pointer_cast(strip->mute_control()); - mute_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCGlobalObserver::send_change_message, this, X_("/master/mute"), strip->mute_control()), OSC::instance()); - send_change_message ("/master/mute", 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 (X_("/master/mute"), strip->mute_control()); boost::shared_ptr trim_controllable = boost::dynamic_pointer_cast(strip->trim_control()); - trim_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCGlobalObserver::send_trim_message, this, X_("/master/trimdB"), strip->trim_control()), OSC::instance()); - send_trim_message ("/master/trimdB", 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 (X_("/master/trimdB"), strip->trim_control()); boost::shared_ptr pan_controllable = boost::dynamic_pointer_cast(strip->pan_azimuth_control()); if (pan_controllable) { - pan_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, 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()); + 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 (X_("/master/pan_stereo_position"), strip->pan_azimuth_control()); } boost::shared_ptr gain_controllable = boost::dynamic_pointer_cast(strip->gain_control()); - if (gainmode) { - gain_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCGlobalObserver::send_gain_message, this, X_("/master/fader"), strip->gain_control()), OSC::instance()); - send_gain_message ("/master/fader", strip->gain_control()); - } else { - gain_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCGlobalObserver::send_gain_message, this, X_("/master/gain"), strip->gain_control()), OSC::instance()); - send_gain_message ("/master/gain", 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 (X_("/master/"), strip->gain_control()); // monitor stuff next - /* - * Monitor (todo) - * Mute - * Dim - * Mono - * Rude Solo - * etc. - */ strip = session->monitor_out(); if (strip) { + _osc.text_message (X_("/monitor/name"), "Monitor", addr); + + boost::shared_ptr 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 (X_("/monitor/mute"), mon_mute_cont); + + boost::shared_ptr 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 (X_("/monitor/dim"), mon_dim_cont); + + boost::shared_ptr 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 (X_("/monitor/mono"), mon_mono_cont); - // Hmm, it seems the monitor mute is not at route->mute_control() - /*boost::shared_ptr mute_controllable2 = boost::dynamic_pointer_cast(strip->mute_control()); - //mute_controllable = boost::dynamic_pointer_cast(r2->mute_control()); - mute_controllable2->Changed.connect (monitor_mute_connection, MISSING_INVALIDATOR, bind (&OSCGlobalObserver::send_change_message, this, X_("/monitor/mute"), strip->mute_control()), OSC::instance()); - send_change_message ("/monitor/mute", strip->mute_control()); - */ gain_controllable = boost::dynamic_pointer_cast(strip->gain_control()); - if (gainmode) { - gain_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCGlobalObserver::send_gain_message, this, X_("/monitor/fader"), strip->gain_control()), OSC::instance()); - send_gain_message ("/monitor/fader", strip->gain_control()); - } else { - gain_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCGlobalObserver::send_gain_message, this, X_("/monitor/gain"), strip->gain_control()), OSC::instance()); - send_gain_message ("/monitor/gain", 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 (X_("/monitor/"), strip->gain_control()); } - /* - * Transport (todo) - * punchin/out - */ //Transport feedback session->TransportStateChange.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_transport_state_changed, this), OSC::instance()); send_transport_state_changed (); session->TransportLooped.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_transport_state_changed, this), OSC::instance()); session->RecordStateChanged.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_record_state_changed, this), OSC::instance()); send_record_state_changed (); + session->locations_modified.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::marks_changed, this), OSC::instance()); + marks_changed (); // session feedback - session->StateSaved.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::text_message, this, X_("/session_name"), _1), OSC::instance()); - text_message (X_("/session_name"), session->snap_name()); + session->StateSaved.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::session_name, this, X_("/session_name"), _1), OSC::instance()); + session_name (X_("/session_name"), session->snap_name()); session->SoloActive.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::solo_active, this, _1), OSC::instance()); solo_active (session->soloing() || session->listening()); + boost::shared_ptr click_controllable = boost::dynamic_pointer_cast(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 (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()); + session->route_groups_reordered.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::group_changed, this), OSC::instance()); + _osc.send_group_list (addr); + + extra_check (); + jog_mode (jogmode); + /* * Maybe (many) more */ } + _init = false; } OSCGlobalObserver::~OSCGlobalObserver () { + _init = true; + // need to add general zero everything messages strip_connections.drop_connections (); session_connections.drop_connections (); lo_address_free (addr); } +void +OSCGlobalObserver::clear_observer () +{ + strip_connections.drop_connections (); + session_connections.drop_connections (); + _osc.text_message (X_("/master/name"), " ", addr); + _osc.text_message (X_("/monitor/name"), " ", addr); + _osc.text_message (X_("/session_name"), " ", addr); + _osc.text_message (X_("/marker"), " ", addr); + if (feedback[6]) { // timecode enabled + _osc.text_message (X_("/position/smpte"), " ", addr); + } + if (feedback[5]) { // Bar beat enabled + _osc.text_message (X_("/position/bbt"), " ", addr); + } + if (feedback[11]) { // minutes/seconds enabled + _osc.text_message (X_("/position/time"), " ", addr); + } + if (feedback[10]) { // samples + _osc.text_message (X_("/position/samples"), " ", addr); + } + if (feedback[3]) { //heart beat enabled + _osc.float_message (X_("/heartbeat"), 0.0, addr); + } + if (feedback[7] || feedback[8]) { // meters enabled + float meter = 0; + if (feedback[7] && !gainmode) { + meter = -193; + } + _osc.float_message (X_("/master/meter"), meter, addr); + } + if (feedback[9]) { + _osc.float_message (X_("/master/signal"), 0, 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 (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); + _osc.float_message (X_("/toggle_roll"), 0, addr); + _osc.float_message (X_("/rewind"), 0, addr); + _osc.float_message (X_("/ffwd"), 0, addr); + _osc.float_message (X_("/record_tally"), 0, addr); + _osc.float_message (X_("/rec_enable_toggle"), 0, addr); + _osc.float_message (X_("/cancel_all_solos"), 0, addr); + _osc.float_message (X_("/toggle_punch_out"), 0, addr); + _osc.float_message (X_("/toggle_punch_in"), 0, addr); + _osc.float_message (X_("/toggle_click"), 0, addr); + _osc.float_message (X_("/click/level"), 0, addr); + _osc.text_message (X_("/group/list"), " ", addr); + _osc.text_message (X_("/jog/mode/name"), " ", addr); + _osc.int_message (X_("/jog/mode"), 0, addr); + + +} + void OSCGlobalObserver::tick () { - framepos_t now_frame = session->transport_frame(); - if (now_frame != _last_frame) { + if (_init) { + return; + } + samplepos_t now_sample = session->transport_sample(); + if (now_sample != _last_sample) { if (feedback[6]) { // timecode enabled Timecode::Time timecode; - session->timecode_time (now_frame, timecode); + session->timecode_time (now_sample, timecode); - // Timecode mode: Hours/Minutes/Seconds/Frames + // Timecode mode: Hours/Minutes/Seconds/Samples ostringstream os; os << setw(2) << setfill('0') << timecode.hours; os << ':'; @@ -154,12 +239,12 @@ OSCGlobalObserver::tick () os << ':'; os << setw(2) << setfill('0') << timecode.frames; - text_message ("/position/smpte", os.str()); + _osc.text_message (X_("/position/smpte"), os.str(), addr); } if (feedback[5]) { // Bar beat enabled Timecode::BBT_Time bbt_time; - session->bbt_time (now_frame, bbt_time); + session->bbt_time (now_sample, bbt_time); // semantics: BBB/bb/tttt ostringstream os; @@ -170,17 +255,17 @@ OSCGlobalObserver::tick () os << '|'; os << setw(4) << setfill('0') << bbt_time.ticks; - text_message ("/position/bbt", os.str()); + _osc.text_message (X_("/position/bbt"), os.str(), addr); } if (feedback[11]) { // minutes/seconds enabled - framepos_t left = now_frame; - int hrs = (int) floor (left / (session->frame_rate() * 60.0f * 60.0f)); - left -= (framecnt_t) floor (hrs * session->frame_rate() * 60.0f * 60.0f); - int mins = (int) floor (left / (session->frame_rate() * 60.0f)); - left -= (framecnt_t) floor (mins * session->frame_rate() * 60.0f); - int secs = (int) floor (left / (float) session->frame_rate()); - left -= (framecnt_t) floor ((double)(secs * session->frame_rate())); - int millisecs = floor (left * 1000.0 / (float) session->frame_rate()); + samplepos_t left = now_sample; + int hrs = (int) floor (left / (session->sample_rate() * 60.0f * 60.0f)); + left -= (samplecnt_t) floor (hrs * session->sample_rate() * 60.0f * 60.0f); + int mins = (int) floor (left / (session->sample_rate() * 60.0f)); + left -= (samplecnt_t) floor (mins * session->sample_rate() * 60.0f); + int secs = (int) floor (left / (float) session->sample_rate()); + left -= (samplecnt_t) floor ((double)(secs * session->sample_rate())); + int millisecs = floor (left * 1000.0 / (float) session->sample_rate()); // Min/sec mode: Hours/Minutes/Seconds/msec ostringstream os; @@ -192,21 +277,22 @@ OSCGlobalObserver::tick () os << '.'; os << setw(3) << setfill('0') << millisecs; - text_message ("/position/time", os.str()); + _osc.text_message (X_("/position/time"), os.str(), addr); } if (feedback[10]) { // samples ostringstream os; - os << now_frame; - text_message ("/position/samples", os.str()); + os << now_sample; + _osc.text_message (X_("/position/samples"), os.str(), addr); } - _last_frame = now_frame; + _last_sample = now_sample; + mark_update (); } if (feedback[3]) { //heart beat enabled if (_heartbeat == 10) { - float_message (X_("/heartbeat"), 1.0); + _osc.float_message (X_("/heartbeat"), 1.0, addr); } if (!_heartbeat) { - float_message (X_("/heartbeat"), 0.0); + _osc.float_message (X_("/heartbeat"), 0.0, addr); } _heartbeat++; if (_heartbeat > 20) _heartbeat = 0; @@ -219,13 +305,13 @@ OSCGlobalObserver::tick () if (feedback[7] || feedback[8]) { if (gainmode && feedback[7]) { // change from db to 0-1 - float_message (X_("/master/meter"), ((now_meter + 94) / 100)); + _osc.float_message (X_("/master/meter"), ((now_meter + 94) / 100), addr); } else if ((!gainmode) && feedback[7]) { - float_message (X_("/master/meter"), now_meter); + _osc.float_message (X_("/master/meter"), now_meter, addr); } else if (feedback[8]) { uint32_t ledlvl = (uint32_t)(((now_meter + 54) / 3.75)-1); uint32_t ledbits = ~(0xfff< controllable) { - float_message (path, (float) controllable->get_value()); + float val = controllable->get_value(); + _osc.float_message (path, (float) controllable->internal_to_interface (val), addr); +} + +void +OSCGlobalObserver::session_name (string path, string name) +{ + _osc.text_message (path, name, addr); } void OSCGlobalObserver::send_gain_message (string path, boost::shared_ptr controllable) { - if (gainmode) { - float_message (path, gain_to_slider_position (controllable->get_value())); + bool ismaster = false; + if (path.find(X_("master")) != std::string::npos) { + ismaster = true; + if (_last_master_gain != controllable->get_value()) { + _last_master_gain = controllable->get_value(); + } else { + return; + } } else { + if (_last_monitor_gain != controllable->get_value()) { + _last_monitor_gain = controllable->get_value(); + } else { + return; + } + } + if (gainmode) { + _osc.float_message (string_compose (X_("%1fader"), path), controllable->internal_to_interface (controllable->get_value()), addr); + if (gainmode == 1) { + _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 { + monitor_timeout = 8; + } + } + } + if (!gainmode || gainmode == 2) { if (controllable->get_value() < 1e-15) { - float_message (path, -200); + _osc.float_message (string_compose (X_("%1gain"),path), -200, addr); } else { - float_message (path, accurate_coefficient_to_dB (controllable->get_value())); + _osc.float_message (string_compose (X_("%1gain"),path), accurate_coefficient_to_dB (controllable->get_value()), addr); } } } @@ -266,67 +398,170 @@ OSCGlobalObserver::send_gain_message (string path, boost::shared_ptr controllable) { - float_message (X_("/master/trimdB"), (float) accurate_coefficient_to_dB (controllable->get_value())); + if (_last_master_trim != controllable->get_value()) { + _last_master_trim = controllable->get_value(); + } else { + return; + } + _osc.float_message (X_("/master/trimdB"), (float) accurate_coefficient_to_dB (controllable->get_value()), addr); } void OSCGlobalObserver::send_transport_state_changed() { - int_message (X_("/loop_toggle"), session->get_play_loop()); - int_message (X_("/transport_play"), session->transport_speed() == 1.0); - int_message (X_("/transport_stop"), session->transport_stopped()); - int_message (X_("/rewind"), session->transport_speed() < 0.0); - int_message (X_("/ffwd"), (session->transport_speed() != 1.0 && session->transport_speed() > 0.0)); + _osc.float_message (X_("/loop_toggle"), session->get_play_loop(), addr); + _osc.float_message (X_("/transport_play"), session->transport_speed() == 1.0, addr); + _osc.float_message (X_("/toggle_roll"), session->transport_speed() == 1.0, addr); + _osc.float_message (X_("/transport_stop"), session->transport_stopped(), addr); + _osc.float_message (X_("/rewind"), session->transport_speed() < 0.0, addr); + _osc.float_message (X_("/ffwd"), (session->transport_speed() != 1.0 && session->transport_speed() > 0.0), addr); +} + +void +OSCGlobalObserver::marks_changed () +{ + const Locations::LocationList& ll (session->locations ()->list ()); + // get Locations that are marks + for (Locations::LocationList::const_iterator l = ll.begin(); l != ll.end(); ++l) { + if ((*l)->is_session_range ()) { + lm.push_back (LocationMarker(_("start"), (*l)->start ())); + lm.push_back (LocationMarker(_("end"), (*l)->end ())); + continue; + } + if ((*l)->is_mark ()) { + lm.push_back (LocationMarker((*l)->name(), (*l)->start ())); + } + } + // sort them by position + LocationMarkerSort location_marker_sort; + std::sort (lm.begin(), lm.end(), location_marker_sort); + mark_update (); + +} + +void +OSCGlobalObserver::mark_update () +{ + if (!lm.size()) { + _osc.text_message (X_("/marker"), "No Marks", addr); + return; + } + uint32_t prev = 0; + uint32_t next = lm.size() - 1; + for (uint32_t i = 0; i < lm.size (); i++) { + if ((lm[i].when <= _last_sample) && (i > prev)) { + prev = i; + } + if ((lm[i].when >= _last_sample) && (i < next)) { + next = i; + break; + } + } + if ((prev_mark != lm[prev].when) || (next_mark != lm[next].when)) { + string send_str = lm[prev].label; + prev_mark = lm[prev].when; + next_mark = lm[next].when; + if (prev != next) { + send_str = string_compose ("%1 <-> %2", lm[prev].label, lm[next].label); + } + if (_last_sample > lm[lm.size() - 1].when) { + send_str = string_compose ("%1 <-", lm[lm.size() - 1].label); + } + if (_last_sample < lm[0].when) { + send_str = string_compose ("-> %1", lm[0].label); + } + _osc.text_message (X_("/marker"), send_str, addr); + } + } void OSCGlobalObserver::send_record_state_changed () { - int_message (X_("/rec_enable_toggle"), (int)session->get_record_enabled ()); + _osc.float_message (X_("/rec_enable_toggle"), (int)session->get_record_enabled (), addr); if (session->have_rec_enabled_track ()) { - int_message (X_("/record_tally"), 1); + _osc.float_message (X_("/record_tally"), 1, addr); } else { - int_message (X_("/record_tally"), 0); + _osc.float_message (X_("/record_tally"), 0, addr); } } void OSCGlobalObserver::solo_active (bool active) { - float_message (X_("/cancel_all_solos"), (float) active); + _osc.float_message (X_("/cancel_all_solos"), (float) active, addr); } void -OSCGlobalObserver::text_message (string path, std::string text) +OSCGlobalObserver::extra_check () { - lo_message msg = lo_message_new (); - - lo_message_add_string (msg, text.c_str()); - - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); + if (last_punchin != session->config.get_punch_in()) { + last_punchin = session->config.get_punch_in(); + _osc.float_message (X_("/toggle_punch_in"), last_punchin, addr); + } + if (last_punchout != session->config.get_punch_out()) { + last_punchout = session->config.get_punch_out(); + _osc.float_message (X_("/toggle_punch_out"), last_punchout, addr); + } + if (last_click != Config->get_clicking()) { + last_click = Config->get_clicking(); + _osc.float_message (X_("/toggle_click"), last_click, addr); + } } void -OSCGlobalObserver::float_message (string path, float value) +OSCGlobalObserver::jog_mode (uint32_t jogmode) { - lo_message msg = lo_message_new (); - - lo_message_add_float (msg, value); - - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); + if (jogmode == _jog_mode || !feedback[4]) { + // no change + return; + } + _jog_mode = jogmode; + + switch(jogmode) + { + case 0: + _osc.text_message (X_("/jog/mode/name"), "Jog", addr); + break; + case 1: + _osc.text_message (X_("/jog/mode/name"), "Nudge", addr); + break; + case 2: + _osc.text_message (X_("/jog/mode/name"), "Scrub", addr); + break; + case 3: + _osc.text_message (X_("/jog/mode/name"), "Shuttle", addr); + break; + case 4: + _osc.text_message (X_("/jog/mode/name"), "Marker", addr); + break; + case 5: + _osc.text_message (X_("/jog/mode/name"), "Scroll", addr); + break; + case 6: + _osc.text_message (X_("/jog/mode/name"), "Track", addr); + break; + case 7: + _osc.text_message (X_("/jog/mode/name"), "Bank", addr); + break; + default: + PBD::warning << X_("Jog Mode: ") << jogmode << X_(" is not valid.") << endmsg; + break; + } + _osc.int_message (X_("/jog/mode"), jogmode, addr); } void -OSCGlobalObserver::int_message (string path, uint32_t value) +OSCGlobalObserver::group_changed (ARDOUR::RouteGroup *rg) { - lo_message msg = lo_message_new (); - - lo_message_add_int32 (msg, value); + _osc.send_group_list (addr); +} - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); +void +OSCGlobalObserver::group_changed () +{ + _osc.send_group_list (addr); } +