OSC: add /strip/hide
[ardour.git] / libs / surfaces / osc / osc_select_observer.cc
index 1c96220df40f0cd968799c9374f23837d28ccb92..d08c454b26df2ad7d6a5c59d1944a99b8d750600 100644 (file)
@@ -56,10 +56,26 @@ OSCSelectObserver::OSCSelectObserver (OSC& o, ArdourSurface::OSC::OSCSurface* su
        ,_last_gain (-1.0)
        ,_last_trim (-1.0)
        ,_init (true)
+       ,eq_bands (0)
+       ,_expand (2048)
 {
        addr = lo_address_new_from_url  (sur->remote_url.c_str());
-       std::cout << "select observer created\n";
-       refresh_strip (true);
+       gainmode = sur->gainmode;
+       feedback = sur->feedback;
+       in_line = feedback[2];
+       send_page_size = sur->send_page_size;
+       send_size = send_page_size;
+       send_page = sur->send_page;
+       plug_page_size = sur->plug_page_size;
+       plug_size = plug_page_size;
+       plug_page = sur->plug_page;
+       if (sur->plugins.size () > 0) {
+               plug_id = sur->plugins[sur->plugin_id - 1];
+       } else {
+               plug_id = -1;
+       }
+       refresh_strip (sur->select, sur->nsends, gainmode, true);
+       set_expand (sur->expand_enable);
 }
 
 OSCSelectObserver::~OSCSelectObserver ()
@@ -76,6 +92,9 @@ OSCSelectObserver::no_strip ()
        _init = true;
 
        strip_connections.drop_connections ();
+       send_connections.drop_connections ();
+       plugin_connections.drop_connections ();
+       eq_connections.drop_connections ();
        /*
         * The strip will sit idle at this point doing nothing until
         * the surface has recalculated it's strip list and then calls
@@ -85,33 +104,38 @@ OSCSelectObserver::no_strip ()
  }
 
 void
-OSCSelectObserver::refresh_strip (bool force)
+OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip, uint32_t s_nsends, uint32_t gm, bool force)
 {
        _init = true;
+       if (_tick_busy) {
+               Glib::usleep(100); // let tick finish
+       }
+       gainmode = gm;
 
-       boost::shared_ptr<ARDOUR::Stripable> new_strip = sur->select;
        if (_strip && (new_strip == _strip) && !force) {
                _init = false;
                return;
        }
-       std::cout << string_compose ("new select: %1\n", new_strip->name());
 
        _strip = new_strip;
+       if (!_strip) {
+               clear_observer ();
+               return;
+       }
+
        _strip->DropReferences.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::no_strip, this), OSC::instance());
        as = ARDOUR::Off;
-       gainmode = sur->gainmode;
-       feedback = sur->feedback;
-       as = ARDOUR::Off;
-       send_size = 0;
-       plug_size = 0;
        _comp_redux = 1;
-       nsends = 0;
+       nsends = s_nsends;
        _last_gain = -1.0;
        _last_trim = -1.0;
 
        _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::name_changed, this, boost::lambda::_1), OSC::instance());
        name_changed (ARDOUR::Properties::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);
+
        _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());
 
@@ -218,15 +242,31 @@ OSCSelectObserver::refresh_strip (bool force)
                _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());
        }
-
+       renew_sends ();
+       renew_plugin ();
+       eq_restart(0);
        _init = false;
 
        tick();
 }
 
+void
+OSCSelectObserver::set_expand (uint32_t expand)
+{
+       if (expand != _expand) {
+               _expand = expand;
+               if (expand) {
+                       _osc.float_message ("/select/expand", 1.0, addr);
+               } else {
+                       _osc.float_message ("/select/expand", 0.0, addr);
+               }
+       }
+}
+
 void
 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);
@@ -271,54 +311,47 @@ OSCSelectObserver::clear_observer ()
        _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);
        send_end();
        plugin_end();
        eq_end();
 }
 
 void
-OSCSelectObserver::renew_sends () {
-       send_end();
-       send_init();
+OSCSelectObserver::set_send_page (uint32_t page)
+{
+       if (send_page != page) {
+               send_page = page;
+               renew_sends ();
+       }
 }
 
 void
-OSCSelectObserver::renew_plugin () {
-       plugin_end();
-       plugin_init();
+OSCSelectObserver::set_send_size (uint32_t size)
+{
+       send_page_size = size;
+       renew_sends ();
+}
+
+void
+OSCSelectObserver::renew_sends () {
+       send_connections.drop_connections ();
+       send_timeout.clear();
+       send_init();
 }
 
 void
 OSCSelectObserver::send_init()
 {
-       // we don't know how many there are, so find out.
-       bool sends;
-       nsends  = 0;
-       do {
-               sends = false;
-               if (_strip->send_level_controllable (nsends)) {
-                       sends = true;
-                       nsends++;
-               }
-       } while (sends);
-       if (!nsends) {
+       send_size = nsends;
+       if (send_page_size) {
+               send_size = send_page_size;
+       }
+       if (!send_size) {
                return;
        }
-
-       // paging should be done in osc.cc in case there is no feedback
-       send_size = nsends;
-       if (sur->send_page_size) {
-               send_size = sur->send_page_size;
-       }
-       // check limits
-       uint32_t max_page = (uint32_t)(nsends / send_size) + 1;
-       if (sur->send_page < 1) {
-               sur->send_page = 1;
-       } else if ((uint32_t)sur->send_page > max_page) {
-               sur->send_page = max_page;
-       }
-       uint32_t page_start = ((sur->send_page - 1) * send_size);
-       uint32_t last_send = sur->send_page * send_size;
+       uint32_t page_start = ((send_page - 1) * send_size);
+       uint32_t last_send = send_page * send_size;
        uint32_t c = 1;
        send_timeout.push_back (2);
        _last_send.clear();
@@ -330,9 +363,13 @@ OSCSelectObserver::send_init()
                if (_strip->send_level_controllable (s)) {
                        _strip->send_level_controllable(s)->Changed.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_gain, this, c, _strip->send_level_controllable(s)), OSC::instance());
                        send_timeout.push_back (2);
-                       _last_send.push_back (0.0);
+                       _last_send.push_back (20.0);
                        send_gain (c, _strip->send_level_controllable(s));
                        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);
                }
 
                if (_strip->send_enable_controllable (s)) {
@@ -342,80 +379,133 @@ OSCSelectObserver::send_init()
                        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, addr);
+                               _osc.float_message_with_id ("/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(), addr);
+                               _osc.float_message_with_id ("/select/send_enable", c, proc->enabled(), in_line, addr);
                        }
                }
-               if (!gainmode && send_valid) {
-                       _osc.text_message_with_id ("/select/send_name", c, _strip->send_name(s), addr);
+               if ((gainmode != 1) && send_valid) {
+                       _osc.text_message_with_id ("/select/send_name", c, _strip->send_name(s), in_line, addr);
                }
        }
 }
 
+void
+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);
+               } else {
+                       _osc.float_message_with_id ("/select/send_gain", i, -193, in_line, addr);
+               }
+               // next enable
+               _osc.float_message_with_id ("/select/send_enable", i, 0, in_line, addr);
+               // next name
+               _osc.text_message_with_id ("/select/send_name", i, " ", in_line, addr);
+       }
+       // need to delete or clear send_timeout
+       send_size = 0;
+       send_timeout.clear();
+}
+
+void
+OSCSelectObserver::set_plugin_id (int id, uint32_t page)
+{
+       plug_id = id;
+       plug_page = page;
+       renew_plugin ();
+}
+
+void
+OSCSelectObserver::set_plugin_page (uint32_t page)
+{
+       plug_page = page;
+       renew_plugin ();
+}
+
+void
+OSCSelectObserver::set_plugin_size (uint32_t size)
+{
+       plug_page_size = size;
+       renew_plugin ();
+}
+
+void
+OSCSelectObserver::renew_plugin () {
+       plugin_connections.drop_connections ();
+       plugin_init();
+}
+
 void
 OSCSelectObserver::plugin_init()
 {
-       if (!sur->plugin_id) {
+       if (plug_id < 0) {
+               plugin_end ();
                return;
        }
-
        boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(_strip);
        if (!r) {
+               plugin_end ();
                return;
        }
 
        // we have a plugin number now get the processor
-       boost::shared_ptr<Processor> proc = r->nth_plugin (sur->plugins[sur->plugin_id - 1]);
+       boost::shared_ptr<Processor> proc = r->nth_plugin (plug_id);
        boost::shared_ptr<PluginInsert> pi;
        if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(proc))) {
+               plugin_end ();
                return;
        }
        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);
 
        bool ok = false;
-       nplug_params = sur->plug_params.size ();
+       // put only input controls into a vector
+       plug_params.clear ();
+       uint32_t nplug_params  = pip->parameter_count();
+       for ( uint32_t ppi = 0;  ppi < nplug_params; ++ppi) {
+               uint32_t controlid = pip->nth_parameter(ppi, ok);
+               if (!ok) {
+                       continue;
+               }
+               if (pip->parameter_is_input(controlid)) {
+                       plug_params.push_back (ppi);
+               }
+       }
+       nplug_params = plug_params.size ();
 
        // default of 0 page size means show all
        plug_size = nplug_params;
-       if (sur->plug_page_size) {
-               plug_size = sur->plug_page_size;
+       if (plug_page_size) {
+               plug_size = plug_page_size;
        }
        _osc.text_message ("/select/plugin/name", pip->name(), addr);
-       uint32_t page_end = nplug_params;
-       uint32_t max_page = 1;
-       if (plug_size && nplug_params) {
-               max_page = (uint32_t)((nplug_params - 1) / plug_size) + 1;
-       }
-
-       if (sur->plug_page < 1) {
-               sur->plug_page = 1;
-       }
-       if ((uint32_t)sur->plug_page > max_page) {
-               sur->plug_page = max_page;
-       }
-       uint32_t page_start = ((sur->plug_page - 1) * plug_size);
-       page_end = sur->plug_page * plug_size;
+       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, " ", addr);
-                       _osc.float_message_with_id ("/select/plugin/parameter", pid, 0, addr);
+                       _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);
                        continue;
                }
 
-               uint32_t controlid = pip->nth_parameter(sur->plug_params[ppi], ok);
+               uint32_t controlid = pip->nth_parameter(plug_params[ppi], ok);
                if (!ok) {
                        continue;
                }
                ParameterDescriptor pd;
                pip->get_parameter_descriptor(controlid, pd);
-               _osc.text_message_with_id ("/select/plugin/parameter/name", pid, pd.label, addr);
+               _osc.text_message_with_id ("/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) {
@@ -430,26 +520,6 @@ OSCSelectObserver::plugin_init()
        }
 }
 
-void
-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, addr);
-               } else {
-                       _osc.float_message_with_id ("/select/send_gain", i, -193, addr);
-               }
-               // next enable
-               _osc.float_message_with_id ("/select/send_enable", i, 0, addr);
-               // next name
-               _osc.text_message_with_id ("/select/send_name", i, " ", addr);
-       }
-       // need to delete or clear send_timeout
-       send_timeout.clear();
-       nsends = 0;
-}
-
 void
 OSCSelectObserver::plugin_parameter_changed (int pid, bool swtch, boost::shared_ptr<PBD::Controllable> controllable)
 {
@@ -464,12 +534,14 @@ void
 OSCSelectObserver::plugin_end ()
 {
        plugin_connections.drop_connections ();
+       _osc.float_message ("/select/plugin/activate", 0, addr);
        _osc.text_message ("/select/plugin/name", " ", addr);
        for (uint32_t i = 1; i <= plug_size; i++) {
-               _osc.float_message_with_id ("/select/plugin/parameter", i, 0, addr);
+               _osc.float_message_with_id ("/select/plugin/parameter", i, 0, in_line, addr);
                // next name
-               _osc.text_message_with_id ("/select/plugin/parameter/name", i, " ", addr);
+               _osc.text_message_with_id ("/select/plugin/parameter/name", i, " ", in_line, addr);
        }
+       plug_size = 0;
        nplug_params = 0;
 }
 
@@ -479,6 +551,7 @@ OSCSelectObserver::tick ()
        if (_init) {
                return;
        }
+       _tick_busy = true;
        if (feedback[7] || feedback[8] || feedback[9]) { // meters enabled
                float now_meter;
                if (_strip->peak_meter()) {
@@ -537,12 +610,13 @@ OSCSelectObserver::tick ()
        for (uint32_t i = 1; i <= send_timeout.size(); i++) {
                if (send_timeout[i]) {
                        if (send_timeout[i] == 1) {
-                               uint32_t pg_offset = (sur->send_page - 1) * sur->send_page_size;
-                               _osc.text_message_with_id ("/select/send_name", i, _strip->send_name(pg_offset + i - 1), addr);
+                               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);
                        }
                        send_timeout[i]--;
                }
        }
+       _tick_busy = false;
 }
 
 void
@@ -568,6 +642,12 @@ OSCSelectObserver::name_changed (const PBD::PropertyChange& what_changed)
        }
 }
 
+void
+OSCSelectObserver::pi_changed (PBD::PropertyChange const& what_changed)
+{
+       _osc.float_message ("/select/hide", _strip->is_hidden (), addr);
+}
+
 void
 OSCSelectObserver::change_message (string path, boost::shared_ptr<Controllable> controllable)
 {
@@ -588,12 +668,21 @@ OSCSelectObserver::enable_message (string path, boost::shared_ptr<Controllable>
 
 }
 
+void
+OSCSelectObserver::plug_enable (string path, boost::shared_ptr<Processor> proc)
+{
+       // with no delay value is wrong
+       Glib::usleep(10);
+
+       _osc.float_message (path, proc->enabled(), addr);
+}
+
 void
 OSCSelectObserver::change_message_with_id (string path, uint32_t id, boost::shared_ptr<Controllable> controllable)
 {
        float val = controllable->get_value();
 
-       _osc.float_message_with_id (path, id, (float) controllable->internal_to_interface (val), addr);
+       _osc.float_message_with_id (path, id, (float) controllable->internal_to_interface (val), in_line, addr);
 }
 
 void
@@ -601,9 +690,9 @@ OSCSelectObserver::enable_message_with_id (string path, uint32_t id, boost::shar
 {
        float val = controllable->get_value();
        if (val) {
-               _osc.float_message_with_id (path, id, 1, addr);
+               _osc.float_message_with_id (path, id, 1, in_line, addr);
        } else {
-               _osc.float_message_with_id (path, id, 0, addr);
+               _osc.float_message_with_id (path, id, 0, in_line, addr);
        }
 }
 
@@ -653,10 +742,13 @@ OSCSelectObserver::gain_message ()
        }
 
        if (gainmode) {
-               _osc.text_message ("/select/name", string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (value)), addr);
-               gain_timeout = 8;
                _osc.float_message ("/select/fader", _strip->gain_control()->internal_to_interface (value), addr);
-       } else {
+               if (gainmode == 1) {
+                       _osc.text_message ("/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);
                } else {
@@ -706,37 +798,48 @@ OSCSelectObserver::gain_automation ()
 void
 OSCSelectObserver::send_gain (uint32_t id, boost::shared_ptr<PBD::Controllable> controllable)
 {
-       if (_last_send[id] != controllable->get_value()) {
-               _last_send[id] = controllable->get_value();
+       float raw_value = 0.0;
+       if (controllable) {
+               raw_value = controllable->get_value();
+       }
+       if (_last_send[id] != raw_value) {
+               _last_send[id] = raw_value;
        } else {
                return;
        }
        string path;
-       float value;
+       float value = 0.0;
        float db;
 #ifdef MIXBUS
-               db = controllable->get_value();
+       if (controllable) {
+               db = raw_value;
+       } else {
+               db = -193;
+       }
 #else
-               if (controllable->get_value() < 1e-15) {
-                       db = -193;
-               } else {
-                       db = accurate_coefficient_to_dB (controllable->get_value());
-               }
+       if (raw_value < 1e-15) {
+               db = -193;
+       } else {
+               db = accurate_coefficient_to_dB (raw_value);
+       }
 #endif
 
        if (gainmode) {
-               path = "/select/send_fader";
-               value = controllable->internal_to_interface (controllable->get_value());
-       _osc.text_message_with_id ("/select/send_name" , id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), db), addr);
-       if (send_timeout.size() > id) {
-               send_timeout[id] = 8;
+               if (controllable) {
+                       value = controllable->internal_to_interface (raw_value);
+               }
+               _osc.float_message_with_id ("/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);
+                       if (send_timeout.size() > id) {
+                               send_timeout[id] = 8;
+                       }
+               }
        }
-       } else {
-               path = "/select/send_gain";
-               value = db;
+       if (!gainmode || gainmode == 2) {
+               _osc.float_message_with_id ("/select/send_gain", id, db, in_line, addr);
        }
 
-       _osc.float_message_with_id (path, id, value, addr);
 }
 
 void
@@ -745,7 +848,7 @@ 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(), addr);
+       _osc.float_message_with_id ("/select/send_enable", id, proc->enabled(), in_line, addr);
 }
 
 void
@@ -795,14 +898,17 @@ OSCSelectObserver::eq_init()
                enable_message ("/select/eq_enable", _strip->eq_enable_controllable());
        }
 
-       uint32_t eq_bands = _strip->eq_band_cnt ();
+       eq_bands = _strip->eq_band_cnt ();
+       if (eq_bands < 0) {
+               eq_bands = 0;
+       }
        if (!eq_bands) {
                return;
        }
 
-       for (uint32_t i = 0; i < eq_bands; i++) {
+       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), addr);
+                       _osc.text_message_with_id ("/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());
@@ -827,19 +933,15 @@ void
 OSCSelectObserver::eq_end ()
 {
        eq_connections.drop_connections ();
-       if (_strip->filter_freq_controllable (true)) {
                _osc.float_message ("/select/eq_hpf", 0, addr);
-       }
-       if (_strip->eq_enable_controllable ()) {
                _osc.float_message ("/select/eq_enable", 0, addr);
-       }
 
-       for (uint32_t i = 1; i <= _strip->eq_band_cnt (); i++) {
-               _osc.text_message_with_id ("/select/eq_band_name", i, " ", addr);
-               _osc.float_message_with_id ("/select/eq_gain", i, 0, addr);
-               _osc.float_message_with_id ("/select/eq_freq", i, 0, addr);
-               _osc.float_message_with_id ("/select/eq_q", i, 0, addr);
-               _osc.float_message_with_id ("/select/eq_shape", i, 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);
 
 
        }
@@ -848,6 +950,7 @@ OSCSelectObserver::eq_end ()
 void
 OSCSelectObserver::eq_restart(int x)
 {
-       eq_end();
+       eq_connections.drop_connections ();
+       //eq_end();
        eq_init();
 }