OSC link: make whole link set follow strip_types
[ardour.git] / libs / surfaces / osc / osc_global_observer.cc
index 85a758e4dd4bbb8857b8654314e3b08cdde39082..9307d989b6a047d5ffa31d1bcb0c69cdc6803524 100644 (file)
 
 #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"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 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)
+       ,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;
-       // connect to all the things we want to send feed back from
+       gainmode = sur->gainmode;
+       feedback = sur->feedback;
+       _last_sample = -1;
+       if (feedback[4]) {
+
+               // connect to all the things we want to send feed back from
 
-       /*
-        *      Master (todo)
-        *              Pan width
-        */
+               /*
+               *       Master (todo)
+               *               Pan width
+               */
 
-       // Master channel first
-       boost::shared_ptr<Stripable> strip = session->master_out();
+               // Master channel first
+               _osc.text_message (X_("/master/name"), "Master", addr);
+               boost::shared_ptr<Stripable> strip = session->master_out();
 
-       boost::shared_ptr<Controllable> mute_controllable = boost::dynamic_pointer_cast<Controllable>(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());
+               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());
 
-       boost::shared_ptr<Controllable> trim_controllable = boost::dynamic_pointer_cast<Controllable>(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());
+               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());
 
-       boost::shared_ptr<Controllable> pan_controllable = boost::dynamic_pointer_cast<Controllable>(strip->pan_azimuth_control());
-               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());
+               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());
+               }
 
-       boost::shared_ptr<Controllable> gain_controllable = boost::dynamic_pointer_cast<Controllable>(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());
-       }
+               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());
 
-       // monitor stuff next
-       /* 
-        *      Monitor (todo)
-        *              Mute
-        *              Dim
-        *              Mono
-        *              Rude Solo
-        *              etc.
-        */
-       strip = session->monitor_out();
-
-       // Hmm, it seems the monitor mute is not at route->mute_control()
-       /*boost::shared_ptr<Controllable> mute_controllable2 = boost::dynamic_pointer_cast<Controllable>(strip->mute_control());
-       //mute_controllable = boost::dynamic_pointer_cast<Controllable>(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<Controllable>(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());
-       }
+               // monitor stuff next
+               strip = session->monitor_out();
+               if (strip) {
+                       _osc.text_message (X_("/monitor/name"), "Monitor", addr);
+
+                       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);
 
-       /*
-        *      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 feedback
-       session->StateSaved.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSCGlobalObserver::send_session_saved, this, _1), OSC::instance());
-       send_session_saved (session->snap_name());
-
-       /*
-        *      Maybe (many) more
-        */
+                       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);
+
+                       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);
+
+                       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());
+               }
+
+               //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 feedback
+               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<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);
+
+               extra_check ();
+
+               /*
+               *       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);
+       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 ("/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/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_("/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);
+
+
+}
+
 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 << ':';
                        os << setw(2) << setfill('0') << timecode.minutes;
                        os << ':';
                        os << setw(2) << setfill('0') << timecode.seconds;
-                       os << '.';
+                       os << ':';
                        os << setw(2) << setfill('0') << timecode.frames;
 
-                       lo_message msg = lo_message_new ();
-                       lo_message_add_string (msg, os.str().c_str());
-                       lo_send_message (addr, "/timecode", msg);
-                       lo_message_free (msg);
+                       _osc.text_message ("/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;
@@ -165,25 +241,43 @@ OSCGlobalObserver::tick ()
                        os << '|';
                        os << setw(4) << setfill('0') << bbt_time.ticks;
 
-                       lo_message msg = lo_message_new ();
-                       lo_message_add_string (msg, os.str().c_str());
-                       lo_send_message (addr, "/bar_beat", msg);
-                       lo_message_free (msg);
+                       _osc.text_message ("/position/bbt", os.str(), addr);
+               }
+               if (feedback[11]) { // minutes/seconds enabled
+                       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;
+                       os << setw(2) << setfill('0') << hrs;
+                       os << ':';
+                       os << setw(2) << setfill('0') << mins;
+                       os << ':';
+                       os << setw(2) << setfill('0') << secs;
+                       os << '.';
+                       os << setw(3) << setfill('0') << millisecs;
+
+                       _osc.text_message ("/position/time", os.str(), addr);
+               }
+               if (feedback[10]) { // samples
+                       ostringstream os;
+                       os << now_sample;
+                       _osc.text_message ("/position/samples", os.str(), addr);
                }
-               _last_frame = now_frame;
+               _last_sample = now_sample;
        }
        if (feedback[3]) { //heart beat enabled
                if (_heartbeat == 10) {
-                       lo_message msg = lo_message_new ();
-                       lo_message_add_float (msg, 1.0);
-                       lo_send_message (addr, "/heartbeat", msg);
-                       lo_message_free (msg);
+                       _osc.float_message (X_("/heartbeat"), 1.0, addr);
                }
                if (!_heartbeat) {
-                       lo_message msg = lo_message_new ();
-                       lo_message_add_float (msg, 0.0);
-                       lo_send_message (addr, "/heartbeat", msg);
-                       lo_message_free (msg);
+                       _osc.float_message (X_("/heartbeat"), 0.0, addr);
                }
                _heartbeat++;
                if (_heartbeat > 20) _heartbeat = 0;
@@ -191,147 +285,154 @@ OSCGlobalObserver::tick ()
        if (feedback[7] || feedback[8] || feedback[9]) { // meters enabled
                // the only meter here is master
                float now_meter = session->master_out()->peak_meter()->meter_level(0, MeterMCP);
-               if (now_meter < -193) now_meter = -193;
+               if (now_meter < -94) now_meter = -193;
                if (_last_meter != now_meter) {
                        if (feedback[7] || feedback[8]) {
-                               lo_message msg = lo_message_new ();
                                if (gainmode && feedback[7]) {
-                                       uint32_t lev1023 = (uint32_t)((now_meter + 54) * 17.05);
-                                       lo_message_add_int32 (msg, lev1023);
-                                       lo_send_message (addr, "/master/meter", msg);
+                                       // change from db to 0-1
+                                       _osc.float_message (X_("/master/meter"), ((now_meter + 94) / 100), addr);
                                } else if ((!gainmode) && feedback[7]) {
-                                       lo_message_add_float (msg, now_meter);
-                                       lo_send_message (addr, "/master/meter", msg);
+                                       _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<<ledlvl);
-                                       lo_message_add_int32 (msg, ledbits);
-                                       lo_send_message (addr, "/master/meter", msg);
+                                       _osc.float_message (X_("/master/meter"), ledbits, addr);
                                }
-                               lo_message_free (msg);
                        }
                        if (feedback[9]) {
-                               lo_message msg = lo_message_new ();
                                float signal;
                                if (now_meter < -40) {
                                        signal = 0;
                                } else {
                                        signal = 1;
                                }
-                               lo_message_add_float (msg, signal);
-                               lo_send_message (addr, "/master/signal", msg);
-                               lo_message_free (msg);
+                               _osc.float_message (X_("/master/signal"), signal, addr);
                        }
                }
                _last_meter = now_meter;
 
        }
+       if (feedback[4]) {
+               if (master_timeout) {
+                       if (master_timeout == 1) {
+                               _osc.text_message (X_("/master/name"), "Master", addr);
+                       }
+                       master_timeout--;
+               }
+               if (monitor_timeout) {
+                       if (monitor_timeout == 1) {
+                               _osc.text_message (X_("/monitor/name"), "Monitor", addr);
+                       }
+                       monitor_timeout--;
+               }
+               extra_check ();
+       }
 }
 
 void
 OSCGlobalObserver::send_change_message (string path, boost::shared_ptr<Controllable> controllable)
 {
-       lo_message msg = lo_message_new ();
-
-       lo_message_add_float (msg, (float) controllable->get_value());
-
+       float val = controllable->get_value();
+       _osc.float_message (path, (float) controllable->internal_to_interface (val), addr);
+}
 
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
+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> controllable)
 {
-       lo_message msg = lo_message_new ();
-
+       bool ismaster = false;
+       if (path.find("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) {
-               if (controllable->get_value() == 1) {
-                       lo_message_add_int32 (msg, 800);
+               _osc.float_message (string_compose ("%1fader", path), controllable->internal_to_interface (controllable->get_value()), addr);
+               _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);
+               if (ismaster) {
+                       master_timeout = 8;
                } else {
-                       lo_message_add_int32 (msg, gain_to_slider_position (controllable->get_value()) * 1023);
+                       monitor_timeout = 8;
                }
+
        } else {
                if (controllable->get_value() < 1e-15) {
-                       lo_message_add_float (msg, -200);
+                       _osc.float_message (string_compose ("%1gain",path), -200, addr);
                } else {
-                       lo_message_add_float (msg, accurate_coefficient_to_dB (controllable->get_value()));
+                       _osc.float_message (string_compose ("%1gain",path), accurate_coefficient_to_dB (controllable->get_value()), addr);
                }
        }
-
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
 }
 
 void
 OSCGlobalObserver::send_trim_message (string path, boost::shared_ptr<Controllable> controllable)
 {
-       lo_message msg = lo_message_new ();
-
-       lo_message_add_float (msg, (float) accurate_coefficient_to_dB (controllable->get_value()));
-
-       lo_send_message (addr, path.c_str(), msg);
-       lo_message_free (msg);
+       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()
 {
-
-       lo_message msg = lo_message_new ();
-       lo_message_add_int32 (msg, session->get_play_loop());
-       lo_send_message (addr, "/loop_toggle", msg);
-       lo_message_free (msg);
-
-       msg = lo_message_new ();
-       lo_message_add_int32 (msg, session->transport_speed() == 1.0);
-       lo_send_message (addr, "/transport_play", msg);
-       lo_message_free (msg);
-
-       msg = lo_message_new ();
-       lo_message_add_int32 (msg, session->transport_stopped ());
-       lo_send_message (addr, "/transport_stop", msg);
-       lo_message_free (msg);
-
-       msg = lo_message_new ();
-       lo_message_add_int32 (msg, session->transport_speed() < 0.0);
-       lo_send_message (addr, "/rewind", msg);
-       lo_message_free (msg);
-
-       msg = lo_message_new ();
-       lo_message_add_int32 (msg, session->transport_speed() > 1.0);
-       lo_send_message (addr, "/ffwd", msg);
-       lo_message_free (msg);
-
+       _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::send_record_state_changed ()
 {
-       lo_message msg = lo_message_new ();
-       lo_message_add_int32 (msg, (int)session->get_record_enabled ());
-       lo_send_message (addr, "/rec_enable_toggle", msg);
-       lo_message_free (msg);
+       _osc.float_message (X_("/rec_enable_toggle"), (int)session->get_record_enabled (), addr);
 
-       msg = lo_message_new ();
        if (session->have_rec_enabled_track ()) {
-               lo_message_add_int32 (msg, 1);
+               _osc.float_message (X_("/record_tally"), 1, addr);
        } else {
-               lo_message_add_int32 (msg, 0);
+               _osc.float_message (X_("/record_tally"), 0, addr);
        }
-       lo_send_message (addr, "/record_tally", msg);
-       lo_message_free (msg);
-
 }
 
 void
-OSCGlobalObserver::send_session_saved (std::string name)
+OSCGlobalObserver::solo_active (bool active)
 {
-       lo_message msg = lo_message_new ();
-       lo_message_add_string (msg, name.c_str());
-       lo_send_message (addr, "/session_name", msg);
-       lo_message_free (msg);
+       _osc.float_message (X_("/cancel_all_solos"), (float) active, addr);
+}
 
+void
+OSCGlobalObserver::extra_check ()
+{
+       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);
+       }
 }