X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.cc;h=ad90dc9207c0db774541fe0bec49ff21bb8d5dec;hb=dade1f39b7809df0013561fd8f7a342928970d56;hp=68bea263f2d75fcb99b5dbdc7402af9d6b8be6df;hpb=37aed5715b69428f86b169377f9597e563fff7df;p=ardour.git

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 68bea263f2..ad90dc9207 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 
 #include "pbd/gstdio_compat.h"
-#include <glibmm/miscutils.h>
+#include <glibmm.h>
 
 #include <pbd/convert.h>
 #include <pbd/pthread_utils.h>
@@ -47,13 +47,16 @@
 #include "ardour/presentation_info.h"
 #include "ardour/send.h"
 #include "ardour/phase_control.h"
+#include "ardour/solo_isolate_control.h"
+#include "ardour/solo_safe_control.h"
+#include "ardour/vca_manager.h"
 
 #include "osc_select_observer.h"
 #include "osc.h"
 #include "osc_controllable.h"
 #include "osc_route_observer.h"
 #include "osc_global_observer.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -88,6 +91,8 @@ OSC::OSC (Session& s, uint32_t port)
 	, _osc_unix_server (0)
 	, _send_route_changes (true)
 	, _debugmode (Off)
+	, tick (true)
+	, bank_dirty (false)
 	, gui (0)
 {
 	_instance = this;
@@ -244,7 +249,18 @@ OSC::start ()
 	periodic_connection = periodic_timeout->connect (sigc::mem_fun (*this, &OSC::periodic));
 	periodic_timeout->attach (main_loop()->get_context());
 
-	StripableSelectionChanged.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::gui_selection_changed, this, _1), this);
+	// catch changes to selection for GUI_select mode
+	StripableSelectionChanged.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::gui_selection_changed, this), this);
+
+	// catch track reordering
+	// receive routes added
+	session->RouteAdded.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::notify_routes_added, this, _1), this);
+	// receive VCAs added
+	session->vca_manager().VCAAdded.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::notify_vca_added, this, _1), this);
+	// order changed
+	PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
+
+	_select = boost::shared_ptr<Stripable>();
 
 	return 0;
 }
@@ -427,6 +443,7 @@ OSC::register_callbacks()
 		REGISTER_CALLBACK (serv, "/toggle_all_rec_enables", "f", toggle_all_rec_enables);
 		REGISTER_CALLBACK (serv, "/all_tracks_rec_in", "f", all_tracks_rec_in);
 		REGISTER_CALLBACK (serv, "/all_tracks_rec_out", "f", all_tracks_rec_out);
+		REGISTER_CALLBACK (serv, "/cancel_all_solos", "f", cancel_all_solos);
 		REGISTER_CALLBACK (serv, "/remove_marker", "", remove_marker_at_playhead);
 		REGISTER_CALLBACK (serv, "/remove_marker", "f", remove_marker_at_playhead);
 		REGISTER_CALLBACK (serv, "/jump_bars", "f", jump_by_bars);
@@ -519,29 +536,49 @@ OSC::register_callbacks()
 		REGISTER_CALLBACK (serv, "/select/record_safe", "i", sel_recsafe);
 		REGISTER_CALLBACK (serv, "/select/mute", "i", sel_mute);
 		REGISTER_CALLBACK (serv, "/select/solo", "i", sel_solo);
+		REGISTER_CALLBACK (serv, "/select/solo_iso", "i", sel_solo_iso);
+		REGISTER_CALLBACK (serv, "/select/solo_safe", "i", sel_solo_safe);
 		REGISTER_CALLBACK (serv, "/select/monitor_input", "i", sel_monitor_input);
 		REGISTER_CALLBACK (serv, "/select/monitor_disk", "i", sel_monitor_disk);
+		REGISTER_CALLBACK (serv, "/select/polarity", "i", sel_phase);
 		REGISTER_CALLBACK (serv, "/select/gain", "f", sel_gain);
 		REGISTER_CALLBACK (serv, "/select/fader", "f", sel_fader);
 		REGISTER_CALLBACK (serv, "/select/trimdB", "f", sel_trim);
 		REGISTER_CALLBACK (serv, "/select/pan_stereo_position", "f", sel_pan_position);
 		REGISTER_CALLBACK (serv, "/select/pan_stereo_width", "f", sel_pan_width);
-
-		REGISTER_CALLBACK (serv, "/select/phase", "i", sel_phase);
+		REGISTER_CALLBACK (serv, "/select/send_gain", "if", sel_sendgain);
+		REGISTER_CALLBACK (serv, "/select/send_fader", "if", sel_sendfader);
+		REGISTER_CALLBACK (serv, "/select/send_enable", "if", sel_sendenable);
+		REGISTER_CALLBACK (serv, "/select/expand", "i", sel_expand);
+		REGISTER_CALLBACK (serv, "/select/pan_elevation_position", "f", sel_pan_elevation);
+		REGISTER_CALLBACK (serv, "/select/pan_frontback_position", "f", sel_pan_frontback);
+		REGISTER_CALLBACK (serv, "/select/pan_lfe_control", "f", sel_pan_lfe);
+		REGISTER_CALLBACK (serv, "/select/comp_enable", "f", sel_comp_enable);
+		REGISTER_CALLBACK (serv, "/select/comp_threshold", "f", sel_comp_threshold);
+		REGISTER_CALLBACK (serv, "/select/comp_speed", "f", sel_comp_speed);
+		REGISTER_CALLBACK (serv, "/select/comp_mode", "f", sel_comp_mode);
+		REGISTER_CALLBACK (serv, "/select/comp_makeup", "f", sel_comp_makeup);
+		REGISTER_CALLBACK (serv, "/select/eq_enable", "f", sel_eq_enable);
+		REGISTER_CALLBACK (serv, "/select/eq_hpf", "f", sel_eq_hpf);
+		REGISTER_CALLBACK (serv, "/select/eq_gain", "if", sel_eq_gain);
+		REGISTER_CALLBACK (serv, "/select/eq_freq", "if", sel_eq_freq);
+		REGISTER_CALLBACK (serv, "/select/eq_q", "if", sel_eq_q);
+		REGISTER_CALLBACK (serv, "/select/eq_shape", "if", sel_eq_shape);
 
 		/* These commands require the route index in addition to the arg; TouchOSC (et al) can't use these  */ 
 		REGISTER_CALLBACK (serv, "/strip/mute", "ii", route_mute);
 		REGISTER_CALLBACK (serv, "/strip/solo", "ii", route_solo);
+		REGISTER_CALLBACK (serv, "/strip/solo_iso", "ii", route_solo_iso);
+		REGISTER_CALLBACK (serv, "/strip/solo_safe", "ii", route_solo_safe);
 		REGISTER_CALLBACK (serv, "/strip/recenable", "ii", route_recenable);
 		REGISTER_CALLBACK (serv, "/strip/record_safe", "ii", route_recsafe);
 		REGISTER_CALLBACK (serv, "/strip/monitor_input", "ii", route_monitor_input);
 		REGISTER_CALLBACK (serv, "/strip/monitor_disk", "ii", route_monitor_disk);
-		REGISTER_CALLBACK (serv, "/strip/select", "ii", strip_select);
-		REGISTER_CALLBACK (serv, "/strip/gui_select", "ii", strip_gui_select);
-		REGISTER_CALLBACK (serv, "/strip/phase", "ii", strip_phase);
+		REGISTER_CALLBACK (serv, "/strip/expand", "ii", strip_expand);
+		REGISTER_CALLBACK (serv, "/strip/select", "ii", strip_gui_select);
+		REGISTER_CALLBACK (serv, "/strip/polarity", "ii", strip_phase);
 		REGISTER_CALLBACK (serv, "/strip/gain", "if", route_set_gain_dB);
 		REGISTER_CALLBACK (serv, "/strip/fader", "if", route_set_gain_fader);
-		REGISTER_CALLBACK (serv, "/strip/trimabs", "if", route_set_trim_abs);
 		REGISTER_CALLBACK (serv, "/strip/trimdB", "if", route_set_trim_dB);
 		REGISTER_CALLBACK (serv, "/strip/pan_stereo_position", "if", route_set_pan_stereo_position);
 		REGISTER_CALLBACK (serv, "/strip/pan_stereo_width", "if", route_set_pan_stereo_width);
@@ -551,6 +588,7 @@ OSC::register_callbacks()
 		REGISTER_CALLBACK (serv, "/strip/send/gainabs", "iif", route_set_send_gain_abs);
 		REGISTER_CALLBACK (serv, "/strip/send/gain", "iif", route_set_send_gain_dB);
 		REGISTER_CALLBACK (serv, "/strip/send/fader", "iif", route_set_send_fader);
+		REGISTER_CALLBACK (serv, "/strip/send/enable", "iif", route_set_send_enable);
 
 		/* still not-really-standardized query interface */
 		//REGISTER_CALLBACK (serv, "/ardour/*/#current_value", "", current_value);
@@ -616,6 +654,9 @@ OSC::get_unix_server_url()
 void
 OSC::listen_to_route (boost::shared_ptr<Stripable> strip, lo_address addr)
 {
+	if (!strip) {
+		return;
+	}
 	/* avoid duplicate listens */
 
 	for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end(); ++x) {
@@ -633,12 +674,19 @@ OSC::listen_to_route (boost::shared_ptr<Stripable> strip, lo_address addr)
 	}
 
 	OSCSurface *s = get_surface(addr);
-	uint32_t sid = get_sid (strip->presentation_info().order() + 1, addr);
-	// above is zero based add 1
-	OSCRouteObserver* o = new OSCRouteObserver (strip, addr, sid, s->gainmode, s->feedback);
+	uint32_t ssid = get_sid (strip, addr);
+	OSCRouteObserver* o = new OSCRouteObserver (strip, addr, ssid, s->gainmode, s->feedback);
 	route_observers.push_back (o);
 
-	strip->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::drop_route, this, boost::weak_ptr<Stripable> (strip)), this);
+	strip->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::route_lost, this, boost::weak_ptr<Stripable> (strip)), this);
+}
+
+void
+OSC::route_lost (boost::weak_ptr<Stripable> wr)
+{
+	tick = false;
+	drop_route (wr);
+	bank_dirty = true;
 }
 
 void
@@ -877,14 +925,44 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_
 			route_recsafe (ssid, argv[0]->f == 1.0, msg);
 			ret = 0;
 		}
+		else if (!strncmp (path, "/strip/expand/", 14) && strlen (path) > 14) {
+			int ssid = atoi (&path[14]);
+			strip_expand (ssid, argv[0]->f == 1.0, msg);
+			ret = 0;
+		}
 		else if (!strncmp (path, "/strip/select/", 14) && strlen (path) > 14) {
 			int ssid = atoi (&path[14]);
-			strip_select (ssid, argv[0]->f == 1.0, msg);
+			strip_gui_select (ssid, argv[0]->f == 1.0, msg);
 			ret = 0;
 		}
-		else if (!strncmp (path, "/strip/gui_select/", 18) && strlen (path) > 18) {
+		else if (!strncmp (path, "/select/send_gain/", 18) && strlen (path) > 18) {
 			int ssid = atoi (&path[18]);
-			strip_gui_select (ssid, argv[0]->f == 1.0, msg);
+			route_mute (ssid, argv[0]->f == 1.0, msg);
+			ret = 0;
+		}
+		else if (!strncmp (path, "/select/send_fader/", 19) && strlen (path) > 19) {
+			int ssid = atoi (&path[19]);
+			route_solo (ssid, argv[0]->f == 1.0, msg);
+			ret = 0;
+		}
+		else if (!strncmp (path, "/select/eq_gain/", 16) && strlen (path) > 16) {
+			int ssid = atoi (&path[16]);
+			route_solo (ssid, argv[0]->f == 1.0, msg);
+			ret = 0;
+		}
+		else if (!strncmp (path, "/select/eq_freq/", 16) && strlen (path) > 16) {
+			int ssid = atoi (&path[16]);
+			route_solo (ssid, argv[0]->f == 1.0, msg);
+			ret = 0;
+		}
+		else if (!strncmp (path, "/select/eq_q/", 13) && strlen (path) > 13) {
+			int ssid = atoi (&path[13]);
+			route_solo (ssid, argv[0]->f == 1.0, msg);
+			ret = 0;
+		}
+		else if (!strncmp (path, "/select/eq_shape/", 17) && strlen (path) > 17) {
+			int ssid = atoi (&path[17]);
+			route_solo (ssid, argv[0]->f == 1.0, msg);
 			ret = 0;
 		}
 	}
@@ -1068,7 +1146,9 @@ OSC::routes_list (lo_message msg)
 			lo_message_add_int32 (reply, r->muted());
 			lo_message_add_int32 (reply, r->soloed());
 			/* XXX Can only use order at this point */
-			lo_message_add_int32 (reply, r->presentation_info().order());
+			//lo_message_add_int32 (reply, r->presentation_info().order());
+			// try this instead.
+			lo_message_add_int32 (reply, get_sid (r, lo_message_get_source (msg)));
 
 			if (boost::dynamic_pointer_cast<AudioTrack>(r)
 					|| boost::dynamic_pointer_cast<MidiTrack>(r)) {
@@ -1097,20 +1177,25 @@ OSC::routes_list (lo_message msg)
 	lo_message_free (reply);
 }
 
+int
+OSC::cancel_all_solos ()
+{
+	session->cancel_all_solo ();
+	return 0;
+}
+
 int
 OSC::set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gm, lo_message msg)
 {
 	OSCSurface *s = get_surface(lo_message_get_source (msg));
 	s->bank_size = b_size;
 	s->strip_types = strips;
-	//next line could be a call that finds out how many strips there are
-	s->nstrips = session->nroutes(); // need to do this for strips
 	s->feedback = fb;
 	s->gainmode = gm;
 	// set bank and strip feedback
 	set_bank(s->bank, msg);
 
-	global_feedback (s->feedback, msg, s->gainmode);
+	global_feedback (s->feedback, lo_message_get_source (msg), s->gainmode);
 	return 0;
 }
 
@@ -1125,14 +1210,11 @@ OSC::set_surface_bank_size (uint32_t bs, lo_message msg)
 	return 0;
 }
 
-
 int
 OSC::set_surface_strip_types (uint32_t st, lo_message msg)
 {
 	OSCSurface *s = get_surface(lo_message_get_source (msg));
 	s->strip_types = st;
-	//next line could be a call that finds out how many strips there are
-	s->nstrips = session->nroutes(); // need to do this for strips
 
 	// set bank and strip feedback
 	set_bank(s->bank, msg);
@@ -1150,7 +1232,7 @@ OSC::set_surface_feedback (uint32_t fb, lo_message msg)
 	set_bank(s->bank, msg);
 
 	// Set global/master feedback
-	global_feedback (s->feedback, msg, s->gainmode);
+	global_feedback (s->feedback, lo_message_get_source (msg), s->gainmode);
 	return 0;
 }
 
@@ -1165,7 +1247,7 @@ OSC::set_surface_gainmode (uint32_t gm, lo_message msg)
 	set_bank(s->bank, msg);
 
 	// Set global/master feedback
-	global_feedback (s->feedback, msg, s->gainmode);
+	global_feedback (s->feedback, lo_message_get_source (msg), s->gainmode);
 	return 0;
 }
 
@@ -1183,37 +1265,44 @@ OSC::get_surface (lo_address addr)
 			return &_surface[it];
 		}
 	}
+	// if we do this when OSC is started we get the wrong stripable
+	// we don't need this until we actually have a surface to deal with
+	if (!_select || (_select != ControlProtocol::first_selected_stripable())) {
+		gui_selection_changed();
+	}
+
 	// No surface create one with default values
 	OSCSurface s;
 	s.remote_url = r_url;
 	s.bank = 1;
 	s.bank_size = 0; // need to find out how many strips there are
-	s.nstrips = session->nroutes(); // may need to do this after MARK below
 	s.strip_types = 31; // 31 is tracks, busses, and VCAs (no master/monitor)
 	s.feedback = 0;
 	s.gainmode = 0;
 	s.sel_obs = 0;
-	s.surface_sel = 0;
-	//get sorted should go here
+	s.expand = 0;
+	s.expand_enable = false;
+	s.strips = get_sorted_stripables(s.strip_types);
+
+	s.nstrips = s.strips.size();
 	_surface.push_back (s);
-	//MARK
+
 	return &_surface[_surface.size() - 1];
 }
 
 // setup global feedback for a surface
 void
-OSC::global_feedback (bitset<32> feedback, lo_address msg, uint32_t gainmode)
+OSC::global_feedback (bitset<32> feedback, lo_address addr, uint32_t gainmode)
 {
 	// first destroy global observer for this surface
 	GlobalObservers::iterator x;
-
 	for (x = global_observers.begin(); x != global_observers.end();) {
 
 		OSCGlobalObserver* ro;
 
 		if ((ro = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
 
-			int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(lo_message_get_source (msg)));
+			int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr));
 
 			if (res == 0) {
 				delete *x;
@@ -1227,12 +1316,48 @@ OSC::global_feedback (bitset<32> feedback, lo_address msg, uint32_t gainmode)
 	}
 	if (feedback[4] || feedback[3] || feedback[5] || feedback[6]) {
 		// create a new Global Observer for this surface
-		//OSCSurface *s = get_surface (lo_message_get_source (msg));
-		OSCGlobalObserver* o = new OSCGlobalObserver (*session, lo_message_get_source (msg), gainmode, /*s->*/feedback);
+		OSCGlobalObserver* o = new OSCGlobalObserver (*session, addr, gainmode, /*s->*/feedback);
 		global_observers.push_back (o);
 	}
 }
 
+void
+OSC::notify_routes_added (ARDOUR::RouteList &)
+{
+	// not sure if we need this
+	//recalcbanks();
+}
+
+void
+OSC::notify_vca_added (ARDOUR::VCAList &)
+{
+	// not sure if we need this
+	//recalcbanks();
+}
+
+void
+OSC::recalcbanks ()
+{
+	tick = false;
+	bank_dirty = true;
+}
+
+void
+OSC::_recalcbanks ()
+{
+	if (!_select || (_select != ControlProtocol::first_selected_stripable())) {
+		_select = ControlProtocol::first_selected_stripable();
+	}
+
+	// do a set_bank for each surface we know about.
+	for (uint32_t it = 0; it < _surface.size(); ++it) {
+		OSCSurface* sur = &_surface[it];
+		// find lo_address
+		lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
+		_set_bank (sur->bank, addr);
+	}
+}
+
 /*
  * This gets called not only when bank changes but also:
  *  - bank size change
@@ -1245,70 +1370,97 @@ OSC::global_feedback (bitset<32> feedback, lo_address msg, uint32_t gainmode)
  */
 int
 OSC::set_bank (uint32_t bank_start, lo_message msg)
+{
+	return _set_bank (bank_start, lo_message_get_source (msg));
+}
+
+// set bank is callable with either message or address
+int
+OSC::_set_bank (uint32_t bank_start, lo_address addr)
 {
 	if (!session) {
 		return -1;
 	}
-	//StripableList strips;
-	//session->get_stripables (strips);
 	// no nstripables yet
 	if (!session->nroutes()) {
 		return -1;
 	}
-	// don't include monitor or master in count for now
-	uint32_t nstrips;
-	if (session->monitor_out ()) {
-		nstrips = session->nroutes() - 2;
-	} else {
-		nstrips = session->nroutes() - 1;
-	}
-	// reset local select
-	_strip_select (0, lo_message_get_source (msg));
-	// undo all listeners for this url
-	for (int n = 0; n <= (int) nstrips; ++n) {
 
-		boost::shared_ptr<Stripable> stp = session->get_remote_nth_stripable (n, PresentationInfo::Route);
+	OSCSurface *s = get_surface (addr);
+
+	// revert any expand to select
+	 s->expand = 0;
+	 s->expand_enable = false;
+	_strip_select (ControlProtocol::first_selected_stripable(), addr);
+
+	// undo all listeners for this url
+	StripableList stripables;
+	session->get_stripables (stripables);
+	for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
 
+		boost::shared_ptr<Stripable> stp = *it;
 		if (stp) {
-			end_listen (stp, lo_message_get_source (msg));
+			end_listen (stp, addr);
 		}
 	}
 
-	OSCSurface *s = get_surface (lo_message_get_source (msg));
-	uint32_t b_size;
+	s->strips = get_sorted_stripables(s->strip_types);
+	s->nstrips = s->strips.size();
 
+	uint32_t b_size;
 	if (!s->bank_size) {
-		// no banking
-		b_size = nstrips;
+		// no banking - bank includes all stripables
+		b_size = s->nstrips;
 	} else {
 		b_size = s->bank_size;
 	}
 
-	// Do limits checking - high end still not quite right
+	// Do limits checking
 	if (bank_start < 1) bank_start = 1;
-	if (b_size >= nstrips)  {
+	if (b_size >= s->nstrips)  {
 		bank_start = 1;
-	} else if ((bank_start > nstrips)) {
-		bank_start = (uint32_t)((nstrips - b_size) + 1);
+	} else if (bank_start > ((s->nstrips - b_size) + 1)) {
+		// top bank is always filled if there are enough strips for at least one bank
+		bank_start = (uint32_t)((s->nstrips - b_size) + 1);
 	}
 	//save bank in case we have had to change it
 	s->bank = bank_start;
 
 	if (s->feedback[0] || s->feedback[1]) {
-		for (int n = bank_start; n < (int) (b_size + bank_start); ++n) {
-			// this next will eventually include strip types
-			boost::shared_ptr<Stripable> stp = session->get_remote_nth_stripable (n - 1, PresentationInfo::Route);
-
-			if (stp) {
-				listen_to_route(stp, lo_message_get_source (msg));
-				if (!s->feedback[10]) {
-					if (stp->is_selected()) {
-						_strip_select (n, lo_message_get_source (msg));
-					}
+
+		for (uint32_t n = bank_start; n < (min ((b_size + bank_start), s->nstrips + 1)); ++n) {
+			if (n <= s->strips.size()) {
+				boost::shared_ptr<Stripable> stp = s->strips[n - 1];
+
+				if (stp) {
+					listen_to_route(stp, addr);
 				}
 			}
 		}
 	}
+	// light bankup or bankdown buttons if it is possible to bank in that direction
+	if (s->feedback[4]) {
+		// these two messages could be bundled
+		lo_message reply;
+		reply = lo_message_new ();
+		if ((s->bank > (s->nstrips - s->bank_size)) || (s->nstrips < s->bank_size)) {
+			lo_message_add_int32 (reply, 0);
+		} else {
+			lo_message_add_int32 (reply, 1);
+		}
+		lo_send_message (addr, "/bank_up", reply);
+		lo_message_free (reply);
+		reply = lo_message_new ();
+		if (s->bank > 1) {
+			lo_message_add_int32 (reply, 1);
+		} else {
+			lo_message_add_int32 (reply, 0);
+		}
+		lo_send_message (addr, "/bank_down", reply);
+		lo_message_free (reply);
+	}
+	bank_dirty = false;
+	tick = true;
 	return 0;
 }
 
@@ -1339,17 +1491,42 @@ OSC::bank_down (lo_message msg)
 }
 
 uint32_t
-OSC::get_sid (uint32_t rid, lo_address addr)
+OSC::get_sid (boost::shared_ptr<ARDOUR::Stripable> strip, lo_address addr)
 {
+	if (!strip) {
+		return 0;
+	}
+
 	OSCSurface *s = get_surface(addr);
-	return rid - s->bank + 1;
+
+	uint32_t b_size;
+	if (!s->bank_size) {
+		// no banking
+		b_size = s->nstrips;
+	} else {
+		b_size = s->bank_size;
+	}
+
+	for (uint32_t n = s->bank; n < (min ((b_size + s->bank), s->nstrips + 1)); ++n) {
+		if (n <= s->strips.size()) {
+			if (strip == s->strips[n-1]) {
+				return n - s->bank + 1;
+			}
+		}
+	}
+	// failsafe... should never get here.
+	return 0;
 }
 
-uint32_t
-OSC::get_rid (uint32_t ssid, lo_address addr)
+boost::shared_ptr<ARDOUR::Stripable>
+OSC::get_strip (uint32_t ssid, lo_address addr)
 {
 	OSCSurface *s = get_surface(addr);
-	return ssid + s->bank - 2;
+	if (ssid && ((ssid + s->bank - 2) < s->nstrips)) {
+		return s->strips[ssid + s->bank - 2];
+	}
+	// guess it is out of range
+	return boost::shared_ptr<ARDOUR::Stripable>();
 }
 
 void
@@ -1445,17 +1622,28 @@ OSC::master_set_trim (float dB)
 }
 
 int
-OSC::master_set_pan_stereo_position (float position)
+OSC::master_set_pan_stereo_position (float position, lo_message msg)
 {
 	if (!session) return -1;
 
+	float endposition = .5;
 	boost::shared_ptr<Stripable> s = session->master_out();
 
 	if (s) {
 		if (s->pan_azimuth_control()) {
 			s->pan_azimuth_control()->set_value (position, PBD::Controllable::NoGroup);
+			endposition = s->pan_azimuth_control()->get_value ();
 		}
 	}
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+
+	if (sur->feedback[4]) {
+		lo_message reply = lo_message_new ();
+		lo_message_add_float (reply, endposition);
+
+		lo_send_message (lo_message_get_source (msg), "/master/pan_stereo_position", reply);
+		lo_message_free (reply);
+	}
 
 	return 0;
 }
@@ -1510,72 +1698,166 @@ int
 OSC::route_mute (int ssid, int yn, lo_message msg)
 {
 	if (!session) return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (s) {
-		s->mute_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+		if (s->mute_control()) {
+			s->mute_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
 
-	return 0;
+	return route_send_fail ("mute", ssid, 0, lo_message_get_source (msg));
 }
 
 int
 OSC::sel_mute (uint32_t yn, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_mute(sur->surface_sel, yn, msg);
-	} else { 
-		return route_send_fail ("mute", 0, 0, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->mute_control()) {
+			s->mute_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
+	return sel_fail ("mute", 0, lo_message_get_source (msg));
 }
 
 int
 OSC::route_solo (int ssid, int yn, lo_message msg)
 {
 	if (!session) return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+
+	if (s) {
+		if (s->solo_control()) {
+			s->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+
+	return route_send_fail ("solo", ssid, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::route_solo_iso (int ssid, int yn, lo_message msg)
+{
+	if (!session) return -1;
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+
+	if (s) {
+		if (s->solo_isolate_control()) {
+			s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+
+	return route_send_fail ("solo_iso", ssid, 0, lo_message_get_source (msg));
+}
 
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+int
+OSC::route_solo_safe (int ssid, int yn, lo_message msg)
+{
+	if (!session) return -1;
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (s) {
-		s->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+		if (s->solo_safe_control()) {
+			s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
 
-	return 0;
+	return route_send_fail ("solo_safe", ssid, 0, lo_message_get_source (msg));
 }
 
 int
 OSC::sel_solo (uint32_t yn, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_solo(sur->surface_sel, yn, msg);
-	} else { 
-		return route_send_fail ("solo", 0, 0, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->solo_control()) {
+			s->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("solo", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_solo_iso (uint32_t yn, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->solo_isolate_control()) {
+			s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("solo_iso", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_solo_safe (uint32_t yn, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->solo_safe_control()) {
+			s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
+	return sel_fail ("solo_safe", 0, lo_message_get_source (msg));
 }
 
 int
 OSC::sel_recenable (uint32_t yn, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_recenable(sur->surface_sel, yn, msg);
-	} else { 
-		return route_send_fail ("recenable", 0, 0, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->rec_enable_control()) {
+			s->rec_enable_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
+	return sel_fail ("recenable", 0, lo_message_get_source (msg));
 }
 
 int
 OSC::route_recenable (int ssid, int yn, lo_message msg)
 {
 	if (!session) return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (s) {
 		if (s->rec_enable_control()) {
@@ -1585,7 +1867,6 @@ OSC::route_recenable (int ssid, int yn, lo_message msg)
 			}
 		}
 	}
-	// hmm, not set for whatever reason tell surface
 	return route_send_fail ("recenable", ssid, 0, lo_message_get_source (msg));
 }
 
@@ -1593,20 +1874,26 @@ int
 OSC::sel_recsafe (uint32_t yn, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_recsafe(sur->surface_sel, yn, msg);
-	} else { 
-		return route_send_fail ("record_safe", 0, 0, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->rec_safe_control()) {
+			s->rec_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
+	return sel_fail ("record_safe", 0, lo_message_get_source (msg));
 }
 
 int
 OSC::route_recsafe (int ssid, int yn, lo_message msg)
 {
 	if (!session) return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 	if (s) {
 		if (s->rec_safe_control()) {
 			s->rec_safe_control()->set_value (yn, PBD::Controllable::UseGroup);
@@ -1615,7 +1902,6 @@ OSC::route_recsafe (int ssid, int yn, lo_message msg)
 			}
 		}
 	}
-	// hmm, not set for whatever reason tell surface
 	return route_send_fail ("record_safe", ssid, 0,lo_message_get_source (msg));
 }
 
@@ -1623,62 +1909,82 @@ int
 OSC::route_monitor_input (int ssid, int yn, lo_message msg)
 {
 	if (!session) return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (s) {
 		boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
 		if (track) {
-			track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
-		} else {
-			route_send_fail ("monitor_input", ssid, 0, lo_message_get_source (msg));
+			if (track->monitoring_control()) {
+				track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+				return 0;
+			}
 		}
 	}
 
-	return 0;
+	return route_send_fail ("monitor_input", ssid, 0, lo_message_get_source (msg));
 }
 
 int
 OSC::sel_monitor_input (uint32_t yn, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_monitor_input(sur->surface_sel, yn, msg);
-	} else { 
-		return route_send_fail ("monitor_input", 0, 0, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
+		if (track) {
+			if (track->monitoring_control()) {
+				track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+				return 0;
+			}
+		}
 	}
+	return sel_fail ("monitor_input", 0, lo_message_get_source (msg));
 }
 
 int
 OSC::route_monitor_disk (int ssid, int yn, lo_message msg)
 {
 	if (!session) return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (s) {
 		boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
 		if (track) {
-			track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup);
-		} else {
-			route_send_fail ("monitor_disk", ssid, 0, lo_message_get_source (msg));
+			if (track->monitoring_control()) {
+				track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup);
+				return 0;
+			}
 		}
 	}
 
-	return 0;
+	return route_send_fail ("monitor_disk", ssid, 0, lo_message_get_source (msg));
 }
 
 int
 OSC::sel_monitor_disk (uint32_t yn, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_monitor_disk(sur->surface_sel, yn, msg);
-	} else { 
-		return route_send_fail ("monitor_disk", 0, 0, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
+		if (track) {
+			if (track->monitoring_control()) {
+				track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup);
+				return 0;
+			}
+		}
 	}
+	return sel_fail ("monitor_disk", 0, lo_message_get_source (msg));
 }
 
 
@@ -1686,88 +1992,121 @@ int
 OSC::strip_phase (int ssid, int yn, lo_message msg)
 {
 	if (!session) return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (s) {
-		s->phase_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+		if (s->phase_control()) {
+			s->phase_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
 
-	return 0;
+	return route_send_fail ("polarity", ssid, 0, lo_message_get_source (msg));
 }
 
 int
 OSC::sel_phase (uint32_t yn, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return strip_phase(sur->surface_sel, yn, msg);
-	} else { 
-		return route_send_fail ("phase", 0, 0, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->phase_control()) {
+			s->phase_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
+	return sel_fail ("polarity", 0, lo_message_get_source (msg));
 }
 
 int
-OSC::strip_select (int ssid, int yn, lo_message msg)
+OSC::strip_expand (int ssid, int yn, lo_message msg)
 {
-	//ignore button release
-	if (!yn) return 0;
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	sur->expand_enable = (bool) yn;
+	sur->expand = ssid;
+	boost::shared_ptr<Stripable> s;
+	if (yn) {
+		s = get_strip (ssid, lo_message_get_source (msg));
+	} else {
+		s = ControlProtocol::first_selected_stripable();
+	}
 
-	return _strip_select ( ssid, lo_message_get_source (msg));
+	return _strip_select (s, lo_message_get_source (msg));
 }
 
 int
-OSC::_strip_select (int ssid, lo_address addr)
+OSC::_strip_select (boost::shared_ptr<Stripable> s, lo_address addr)
 {
 	if (!session) {
-		route_send_fail ("select", ssid, 0, addr);
 		return -1;
 	}
-	int rid = get_rid (ssid, addr);
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
 	OSCSurface *sur = get_surface(addr);
 	if (sur->sel_obs) {
 		delete sur->sel_obs;
 		sur->sel_obs = 0;
 	}
-	sur->surface_sel = 0;
-
 	if (s) {
-		sur->surface_sel = ssid;
-		OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, ssid, sur->gainmode, sur->feedback);
+		OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, sur->gainmode, sur->feedback);
+		s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
 		sur->sel_obs = sel_fb;
+	} else if (sur->expand_enable) {
+		sur->expand = 0;
+		sur->expand_enable = false;
+		if (_select) {
+			OSCSelectObserver* sel_fb = new OSCSelectObserver (_select, addr, sur->gainmode, sur->feedback);
+			_select->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
+			sur->sel_obs = sel_fb;
+		}
 	} else {
-		route_send_fail ("select", ssid, 0 , addr);
+		route_send_fail ("select", sur->expand, 0 , addr);
 	}
+	//update buttons on surface
 	int b_s = sur->bank_size;
 	if (!b_s) { // bank size 0 means we need to know how many strips there are.
 		b_s = sur->nstrips;
 	}
 	for (int i = 1;  i <= b_s; i++) {
-		string path = "select";
-		if (!sur->feedback[10]) {
-			path = "gui_select";
-		}
-		if (i==(int)sur->surface_sel) {
+		string path = "expand";
+
+		if ((i == (int) sur->expand) && sur->expand_enable) {
 			lo_message reply = lo_message_new ();
 			if (sur->feedback[2]) {
 				ostringstream os;
-				os << "/strip/" << path << "/" << ssid;
+				os << "/strip/" << path << "/" << i;
 				path = os.str();
 			} else {
 				ostringstream os;
 				os << "/strip/" << path;
 				path = os.str();
-				lo_message_add_int32 (reply, ssid);
+				lo_message_add_int32 (reply, i);
 			}
-				lo_message_add_float (reply, (float) 1);
+			lo_message_add_float (reply, (float) 1);
 
-				lo_send_message (addr, path.c_str(), reply);
-				lo_message_free (reply);
-			} else {
-				route_send_fail (path, i, 0, addr);
-			}
+			lo_send_message (addr, path.c_str(), reply);
+			lo_message_free (reply);
+			reply = lo_message_new ();
+			lo_message_add_float (reply, 1.0);
+			lo_send_message (addr, "/select/expand", reply);
+			lo_message_free (reply);
+
+		} else {
+			lo_message reply = lo_message_new ();
+			lo_message_add_int32 (reply, i);
+			lo_message_add_float (reply, 0.0);
+			lo_send_message (addr, "/strip/expand", reply);
+			lo_message_free (reply);
+		}
+	}
+	if (!sur->expand_enable) {
+		lo_message reply = lo_message_new ();
+		lo_message_add_float (reply, 0.0);
+		lo_send_message (addr, "/select/expand", reply);
+		lo_message_free (reply);
 	}
 
 	return 0;
@@ -1780,30 +2119,50 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg)
 	if (!yn) return 0;
 
 	if (!session) {
-		route_send_fail ("gui_select", ssid, 0, lo_message_get_source (msg));
+		route_send_fail ("select", ssid, 0, lo_message_get_source (msg));
 		return -1;
 	}
-
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	sur->expand_enable = false;
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 	if (s) {
-	//SetStripableSelection ((*s)->presentation_info().order());
-		SetStripableSelection (rid); //alt above may end up being better
+		SetStripableSelection (s);
 	} else {
-		route_send_fail ("gui_select", ssid, 0, lo_message_get_source (msg));
+		route_send_fail ("select", ssid, 0, lo_message_get_source (msg));
 	}
 
 	return 0;
 }
 
 int
-OSC::route_set_gain_abs (int rid, float level, lo_message msg)
+OSC::sel_expand (uint32_t state, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	sur->expand_enable = (bool) state;
+	if (state && sur->expand) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = ControlProtocol::first_selected_stripable();
+	}
+
+	return _strip_select (s, lo_message_get_source (msg));
+}
+
+int
+OSC::route_set_gain_abs (int ssid, float level, lo_message msg)
 {
 	if (!session) return -1;
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (s) {
-		s->gain_control()->set_value (level, PBD::Controllable::NoGroup);
+		if (s->gain_control()) {
+			s->gain_control()->set_value (level, PBD::Controllable::NoGroup);
+		} else {
+			return 1;
+		}
+	} else {
+		return 1;
 	}
 
 	return 0;
@@ -1817,27 +2176,40 @@ OSC::route_set_gain_dB (int ssid, float dB, lo_message msg)
 		return -1;
 	}
 	int ret;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
 	if (dB < -192) {
-		ret = route_set_gain_abs (rid, 0.0, msg);
+		ret = route_set_gain_abs (ssid, 0.0, msg);
 	} else {
-		ret = route_set_gain_abs (rid, dB_to_coefficient (dB), msg);
+		ret = route_set_gain_abs (ssid, dB_to_coefficient (dB), msg);
 	}
 	if (ret != 0) {
-		route_send_fail ("gain", ssid, -193, lo_message_get_source (msg));
+		return route_send_fail ("gain", ssid, -193, lo_message_get_source (msg));
 	}
-	return ret;
+	return 0;
 }
 
 int
 OSC::sel_gain (float val, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_set_gain_dB(sur->surface_sel, val, msg);
-	} else { 
-		return route_send_fail ("gain", 0, -193, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		float abs;
+		if (val < -192) {
+			abs = 0;
+		} else {
+			abs = dB_to_coefficient (val);
+		}
+		if (s->gain_control()) {
+			s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
+	return sel_fail ("gain", -193, lo_message_get_source (msg));
 }
 
 int
@@ -1848,120 +2220,158 @@ OSC::route_set_gain_fader (int ssid, float pos, lo_message msg)
 		return -1;
 	}
 	int ret;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
 	if ((pos > 799.5) && (pos < 800.5)) {
-		ret = route_set_gain_abs (rid, 1.0, msg);
+		ret = route_set_gain_abs (ssid, 1.0, msg);
 	} else {
-		ret = route_set_gain_abs (rid, slider_position_to_gain_with_max ((pos/1023), 2.0), msg);
+		ret = route_set_gain_abs (ssid, slider_position_to_gain_with_max ((pos/1023), 2.0), msg);
 	}
 	if (ret != 0) {
-		route_send_fail ("fader", ssid, 0, lo_message_get_source (msg));
+		return route_send_fail ("fader", ssid, 0, lo_message_get_source (msg));
 	}
-	return ret;
+	return 0;
 }
 
 int
 OSC::sel_fader (float val, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_set_gain_fader(sur->surface_sel, val, msg);
-	} else { 
-		return route_send_fail ("fader", 0, 0, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		float abs;
+		if ((val > 799.5) && (val < 800.5)) {
+			abs = 1.0;
+		} else {
+			abs = slider_position_to_gain_with_max ((val/1023), 2.0);
+		}
+		if (s->gain_control()) {
+			s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
+	return sel_fail ("fader", 0, lo_message_get_source (msg));
 }
 
 int
 OSC::route_set_trim_abs (int ssid, float level, lo_message msg)
 {
 	if (!session) return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (s) {
 		if (s->trim_control()) {
 			s->trim_control()->set_value (level, PBD::Controllable::NoGroup);
+			return 0;
 		}
 
 	}
 
-	return 0;
+	return -1;
 }
 
 int
 OSC::route_set_trim_dB (int ssid, float dB, lo_message msg)
 {
-	return route_set_trim_abs(ssid, dB_to_coefficient (dB), msg);
+	int ret;
+	ret = route_set_trim_abs(ssid, dB_to_coefficient (dB), msg);
+	if (ret != 0) {
+		return route_send_fail ("trimdB", ssid, 0, lo_message_get_source (msg));
+	}
+
+return 0;
 }
 
 int
 OSC::sel_trim (float val, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_set_trim_dB (sur->surface_sel, val, msg);
-	} else { 
-		return route_send_fail ("trimdB", 0, 0, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->trim_control()) {
+			s->trim_control()->set_value (dB_to_coefficient (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
+	return sel_fail ("trimdB", 0, lo_message_get_source (msg));
 }
 
 int
 OSC::sel_pan_position (float val, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_set_pan_stereo_position (sur->surface_sel, val, msg);
-	} else { 
-		return route_send_fail ("pan_stereo_position", 0, 0.5, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
 	}
+	if (s) {
+		if(s->pan_azimuth_control()) {
+			s->pan_azimuth_control()->set_value (val, PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("pan_stereo_position", 0.5, lo_message_get_source (msg));
 }
 
 int
 OSC::sel_pan_width (float val, lo_message msg)
 {
 	OSCSurface *sur = get_surface(lo_message_get_source (msg));
-	if (sur->surface_sel) {
-		return route_set_pan_stereo_width (sur->surface_sel, val, msg);
-	} else { 
-		return route_send_fail ("pan_stereo_width", 0, 1, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->pan_width_control()) {
+			s->pan_width_control()->set_value (s->pan_width_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
 	}
+	return sel_fail ("pan_stereo_width", 1, lo_message_get_source (msg));
 }
 
 int
 OSC::route_set_pan_stereo_position (int ssid, float pos, lo_message msg)
 {
 	if (!session) return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (s) {
 		if(s->pan_azimuth_control()) {
 			s->pan_azimuth_control()->set_value (pos, PBD::Controllable::NoGroup);
+			return route_send_fail ("pan_stereo_position", ssid, s->pan_azimuth_control()->get_value (), lo_message_get_source (msg));
 		}
 	}
 
-	return 0;
-
+	return route_send_fail ("pan_stereo_position", ssid, 0.5, lo_message_get_source (msg));
 }
 
 int
 OSC::route_set_pan_stereo_width (int ssid, float pos, lo_message msg)
 {
 	if (!session) return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (s) {
 		if (s->pan_width_control()) {
 			s->pan_width_control()->set_value (pos, PBD::Controllable::NoGroup);
+			return 0;
 		}
 	}
 
-	return 0;
-
+	return route_send_fail ("pan_stereo_width", ssid, 1, lo_message_get_source (msg));
 }
 
 int
@@ -1970,9 +2380,7 @@ OSC::route_set_send_gain_abs (int ssid, int sid, float val, lo_message msg)
 	if (!session) {
 		return -1;
 	}
-	int rid = get_rid (ssid, lo_message_get_source (msg));
-
-	boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
 	if (!s) {
 		return -1;
@@ -1986,9 +2394,10 @@ OSC::route_set_send_gain_abs (int ssid, int sid, float val, lo_message msg)
 
 	if (s->send_level_controllable (sid)) {
 		s->send_level_controllable (sid)->set_value (val, PBD::Controllable::NoGroup);
+		return 0;
 	}
 
-	return 0;
+	return -1;
 }
 
 int
@@ -2003,13 +2412,124 @@ OSC::route_set_send_fader (int ssid, int sid, float pos, lo_message msg)
 	if (!session) {
 		return -1;
 	}
-	int ret;
 	if ((pos > 799.5) && (pos < 800.5)) {
-		ret = route_set_send_gain_abs (ssid, sid, 1.0, msg);
+		return route_set_send_gain_abs (ssid, sid, 1.0, msg);
 	} else {
-		ret = route_set_send_gain_abs (ssid, sid, slider_position_to_gain_with_max ((pos/1023), 2.0), msg);
+		return route_set_send_gain_abs (ssid, sid, slider_position_to_gain_with_max ((pos/1023), 2.0), msg);
 	}
-	return ret;
+}
+
+int
+OSC::sel_sendgain (int id, float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	float abs;
+	if (s) {
+		if (val < -192) {
+			abs = 0;
+		} else {
+			abs = dB_to_coefficient (val);
+		}
+		if (id > 0) {
+			--id;
+		}
+
+		if (s->send_level_controllable (id)) {
+			s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_send_fail ("send_gain", id + 1, -193, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_sendfader (int id, float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	float abs;
+	if (s) {
+		if ((val > 799.5) && (val < 800.5)) {
+			abs = 1.0;
+		} else {
+			abs = slider_position_to_gain_with_max ((val/1023), 2.0);
+		}
+		if (id > 0) {
+			--id;
+		}
+
+		if (s->send_level_controllable (id)) {
+			s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_send_fail ("send_gain", id, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::route_set_send_enable (int ssid, int sid, float val, lo_message msg)
+{
+	if (!session) {
+		return -1;
+	}
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+
+	if (s) {
+
+		/* revert to zero-based counting */
+
+		if (sid > 0) {
+			--sid;
+		}
+
+		if (s->send_enable_controllable (sid)) {
+			s->send_enable_controllable (sid)->set_value (val, PBD::Controllable::NoGroup);
+			return 0;
+		}
+
+		if (s->send_level_controllable (sid)) {
+			return 0;
+		}
+
+	}
+
+	return -1;
+}
+
+int
+OSC::sel_sendenable (int id, float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (id > 0) {
+			--id;
+		}
+		if (s->send_enable_controllable (id)) {
+			s->send_enable_controllable (id)->set_value (val, PBD::Controllable::NoGroup);
+			return 0;
+		}
+		if (s->send_level_controllable (id)) {
+			return sel_send_fail ("send_enable", id + 1, 1, lo_message_get_source (msg));
+		}
+	}
+	return sel_send_fail ("send_enable", id + 1, 0, lo_message_get_source (msg));
 }
 
 int
@@ -2017,26 +2537,26 @@ OSC::route_plugin_parameter (int ssid, int piid, int par, float val, lo_message
 {
 	if (!session)
 		return -1;
-	int rid = get_rid (ssid, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
-	boost::shared_ptr<Route> r = session->get_remote_nth_route (rid);
+	boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
 
 	if (!r) {
-		PBD::error << "OSC: Invalid Remote Control ID '" << rid << "'" << endmsg;
+		PBD::error << "OSC: Invalid Remote Control ID '" << ssid << "'" << endmsg;
 		return -1;
 	}
 
 	boost::shared_ptr<Processor> redi=r->nth_plugin (piid);
 
 	if (!redi) {
-		PBD::error << "OSC: cannot find plugin # " << piid << " for RID '" << rid << "'" << endmsg;
+		PBD::error << "OSC: cannot find plugin # " << piid << " for RID '" << ssid << "'" << endmsg;
 		return -1;
 	}
 
 	boost::shared_ptr<PluginInsert> pi;
 
 	if (!(pi = boost::dynamic_pointer_cast<PluginInsert>(redi))) {
-		PBD::error << "OSC: given processor # " << piid << " on RID '" << rid << "' is not a Plugin." << endmsg;
+		PBD::error << "OSC: given processor # " << piid << " on RID '" << ssid << "' is not a Plugin." << endmsg;
 		return -1;
 	}
 
@@ -2046,12 +2566,12 @@ OSC::route_plugin_parameter (int ssid, int piid, int par, float val, lo_message
 	uint32_t controlid = pip->nth_parameter (par,ok);
 
 	if (!ok) {
-		PBD::error << "OSC: Cannot find parameter # " << par <<  " for plugin # " << piid << " on RID '" << rid << "'" << endmsg;
+		PBD::error << "OSC: Cannot find parameter # " << par <<  " for plugin # " << piid << " on RID '" << ssid << "'" << endmsg;
 		return -1;
 	}
 
 	if (!pip->parameter_is_input(controlid)) {
-		PBD::error << "OSC: Parameter # " << par <<  " for plugin # " << piid << " on RID '" << rid << "' is not a control input" << endmsg;
+		PBD::error << "OSC: Parameter # " << par <<  " for plugin # " << piid << " on RID '" << ssid << "' is not a control input" << endmsg;
 		return -1;
 	}
 
@@ -2064,7 +2584,7 @@ OSC::route_plugin_parameter (int ssid, int piid, int par, float val, lo_message
 		// cerr << "parameter:" << redi->describe_parameter(controlid) << " val:" << val << "\n";
 		c->set_value (val, PBD::Controllable::NoGroup);
 	} else {
-		PBD::warning << "OSC: Parameter # " << par <<  " for plugin # " << piid << " on RID '" << rid << "' is out of range" << endmsg;
+		PBD::warning << "OSC: Parameter # " << par <<  " for plugin # " << piid << " on RID '" << ssid << "' is out of range" << endmsg;
 		PBD::info << "OSC: Valid range min=" << pd.lower << " max=" << pd.upper << endmsg;
 	}
 
@@ -2078,9 +2598,9 @@ OSC::route_plugin_parameter_print (int ssid, int piid, int par, lo_message msg)
 	if (!session) {
 		return -1;
 	}
-	int rid = get_rid (ssid, lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 
-	boost::shared_ptr<Route> r = session->get_remote_nth_route (rid);
+	boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
 
 	if (!r) {
 		return -1;
@@ -2121,33 +2641,328 @@ OSC::route_plugin_parameter_print (int ssid, int piid, int par, lo_message msg)
 	return 0;
 }
 
-void
-OSC::gui_selection_changed (StripableNotificationListPtr stripables)
+// select
+
+int
+OSC::sel_pan_elevation (float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->pan_elevation_control()) {
+			s->pan_elevation_control()->set_value (s->pan_elevation_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("pan_elevation_position", 0.5, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_pan_frontback (float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->pan_frontback_control()) {
+			s->pan_frontback_control()->set_value (s->pan_frontback_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("pan_frontback_position", 0.5, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_pan_lfe (float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->pan_lfe_control()) {
+			s->pan_lfe_control()->set_value (s->pan_lfe_control()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("pan_lfe_control", 0, lo_message_get_source (msg));
+}
+
+// compressor control
+int
+OSC::sel_comp_enable (float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->comp_enable_controllable()) {
+			s->comp_enable_controllable()->set_value (s->comp_enable_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("comp_enable", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_comp_threshold (float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->comp_threshold_controllable()) {
+			s->comp_threshold_controllable()->set_value (s->comp_threshold_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("comp_threshold", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_comp_speed (float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->comp_speed_controllable()) {
+			s->comp_speed_controllable()->set_value (s->comp_speed_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("comp_speed", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_comp_mode (float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->comp_mode_controllable()) {
+			s->comp_mode_controllable()->set_value (s->comp_mode_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("comp_mode", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_comp_makeup (float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->comp_makeup_controllable()) {
+			s->comp_makeup_controllable()->set_value (s->comp_makeup_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("comp_makeup", 0, lo_message_get_source (msg));
+}
+
+// EQ control
+
+int
+OSC::sel_eq_enable (float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->eq_enable_controllable()) {
+			s->eq_enable_controllable()->set_value (s->eq_enable_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("eq_enable", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_eq_hpf (float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (s->eq_hpf_controllable()) {
+			s->eq_hpf_controllable()->set_value (s->eq_hpf_controllable()->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_fail ("eq_hpf", 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_eq_gain (int id, float val, lo_message msg)
 {
-	boost::shared_ptr<Stripable> strip;
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (id > 0) {
+			--id;
+		}
+		if (s->eq_gain_controllable (id)) {
+			s->eq_gain_controllable (id)->set_value (s->eq_gain_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_send_fail ("eq_gain", id + 1, 0, lo_message_get_source (msg));
+}
 
-	if (!stripables->empty()) {
-		strip = stripables->front().lock();
+int
+OSC::sel_eq_freq (int id, float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
 	}
+	if (s) {
+		if (id > 0) {
+			--id;
+		}
+		if (s->eq_freq_controllable (id)) {
+			s->eq_freq_controllable (id)->set_value (s->eq_freq_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_send_fail ("eq_freq", id + 1, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_eq_q (int id, float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (id > 0) {
+			--id;
+		}
+		if (s->eq_q_controllable (id)) {
+			s->eq_q_controllable (id)->set_value (s->eq_q_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_send_fail ("eq_q", id + 1, 0, lo_message_get_source (msg));
+}
+
+int
+OSC::sel_eq_shape (int id, float val, lo_message msg)
+{
+	OSCSurface *sur = get_surface(lo_message_get_source (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, lo_message_get_source (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
+		if (id > 0) {
+			--id;
+		}
+		if (s->eq_shape_controllable (id)) {
+			s->eq_shape_controllable (id)->set_value (s->eq_shape_controllable(id)->interface_to_internal (val), PBD::Controllable::NoGroup);
+			return 0;
+		}
+	}
+	return sel_send_fail ("eq_shape", id + 1, 0, lo_message_get_source (msg));
+}
+
+void
+OSC::gui_selection_changed ()
+{
+	boost::shared_ptr<Stripable> strip = ControlProtocol::first_selected_stripable();
+
 	if (strip) {
+		_select = strip;
 		for (uint32_t it = 0; it < _surface.size(); ++it) {
 			OSCSurface* sur = &_surface[it];
-			if(!sur->feedback[10]) {
-				uint32_t sel_strip = strip->presentation_info().order() + 1;
-				if (!(sel_strip < sur->bank) && !(sel_strip >= (sur->bank + sur->bank_size))) {
-					lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
-					_strip_select ((sel_strip - sur->bank + 1), addr);
-				}
+			if(!sur->expand_enable) {
+				lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
+				_strip_select (strip, addr);
 			}
 		}
 	}
-
 }
 
 // timer callbacks
 bool
 OSC::periodic (void)
 {
+	if (!tick) {
+		Glib::usleep(100); // let flurry of signals subside
+		if (global_init) {
+			for (uint32_t it = 0; it < _surface.size(); it++) {
+				OSCSurface* sur = &_surface[it];
+				lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
+				global_feedback (sur->feedback, addr, sur->gainmode);
+			}
+			global_init = false;
+			tick = true;
+		}
+		if (bank_dirty) {
+			_recalcbanks ();
+			bank_dirty = false;
+			tick = true;
+		}
+	}
+
 	for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end(); x++) {
 
 		OSCGlobalObserver* go;
@@ -2164,7 +2979,7 @@ OSC::periodic (void)
 			ro->tick();
 		}
 	}
-	for (uint32_t it = 0; it < _surface.size(); ++it) {
+	for (uint32_t it = 0; it < _surface.size(); it++) {
 		OSCSurface* sur = &_surface[it];
 		OSCSelectObserver* so;
 		if ((so = dynamic_cast<OSCSelectObserver*>(sur->sel_obs)) != 0) {
@@ -2195,7 +3010,7 @@ OSC::route_send_fail (string path, uint32_t ssid, float val, lo_address addr)
 		lo_send_message (addr, str_pth.c_str(), reply);
 		lo_message_free (reply);
 	}
-	if (sur->surface_sel == ssid) {
+	if ((_select == get_strip (ssid, addr)) || ((sur->expand == ssid) && (sur->expand_enable))) {
 		os.str("");
 		os << "/select/" << path;
 		string sel_pth = os.str();
@@ -2208,11 +3023,63 @@ OSC::route_send_fail (string path, uint32_t ssid, float val, lo_address addr)
 	return 0;
 }
 
+int
+OSC::sel_fail (string path, float val, lo_address addr)
+{
+	ostringstream os;
+	os.str("");
+	os << "/select/" << path;
+	string sel_pth = os.str();
+	lo_message reply = lo_message_new ();
+	lo_message_add_float (reply, (float) val);
+	lo_send_message (addr, sel_pth.c_str(), reply);
+	lo_message_free (reply);
+
+	return 0;
+}
+
+int
+OSC::sel_send_fail (string path, uint32_t id, float val, lo_address addr)
+{
+	OSCSurface *sur = get_surface(addr);
+
+	ostringstream os;
+	lo_message reply;
+	reply = lo_message_new ();
+	if (sur->feedback[2]) {
+		os << "/select/" << path << "/" << id;
+	} else {
+		os << "/select/" << path;
+		lo_message_add_int32 (reply, id);
+	}
+	string str_pth = os.str();
+	lo_message_add_float (reply, (float) val);
+
+	lo_send_message (addr, str_pth.c_str(), reply);
+	lo_message_free (reply);
+
+	return 0;
+}
+
 XMLNode&
 OSC::get_state ()
 {
 	XMLNode& node (ControlProtocol::get_state());
 	node.add_property("debugmode", (int) _debugmode); // TODO: enum2str
+	if (_surface.size()) {
+		XMLNode* config = new XMLNode (X_("Configurations"));
+		for (uint32_t it = 0; it < _surface.size(); ++it) {
+			OSCSurface* sur = &_surface[it];
+			XMLNode* devnode = new XMLNode (X_("Configuration"));
+			devnode->add_property (X_("url"), sur->remote_url);
+			devnode->add_property (X_("bank-size"), sur->bank_size);
+			devnode->add_property (X_("strip-types"), sur->strip_types.to_ulong());
+			devnode->add_property (X_("feedback"), sur->feedback.to_ulong());
+			devnode->add_property (X_("gainmode"), sur->gainmode);
+			config->add_child_nocopy (*devnode);
+		}
+		node.add_child_nocopy (*config);
+	}
 	return node;
 }
 
@@ -2226,6 +3093,116 @@ OSC::set_state (const XMLNode& node, int version)
 	if (p) {
 		_debugmode = OSCDebugMode (PBD::atoi(p->value ()));
 	}
+	XMLNode* cnode = node.child (X_("Configurations"));
+
+	if (cnode) {
+		XMLNodeList const& devices = cnode->children();
+		for (XMLNodeList::const_iterator d = devices.begin(); d != devices.end(); ++d) {
+			XMLProperty const * prop = (*d)->property (X_("url"));
+			if (prop) {
+				OSCSurface s;
+				bank_dirty = true;
+				s.remote_url = prop->value();
+				prop = (*d)->property (X_("bank-size"));
+				if (prop) {
+					s.bank_size = atoi (prop->value().c_str());
+				}
+				prop = (*d)->property (X_("strip-types"));
+				if (prop) {
+					s.strip_types = atoi (prop->value().c_str());
+				}
+				prop = (*d)->property (X_("feedback"));
+				if (prop) {
+					s.feedback = atoi (prop->value().c_str());
+				}
+				prop = (*d)->property (X_("gainmode"));
+				if (prop) {
+					s.gainmode = atoi (prop->value().c_str());
+				}
+				s.bank = 1;
+				s.sel_obs = 0;
+				s.expand = 0;
+				s.expand_enable = false;
+				s.strips = get_sorted_stripables(s.strip_types);
+				s.nstrips = s.strips.size();
+				_surface.push_back (s);
+			}
+		}
+	}
+	global_init = true;
+	tick = false;
 
 	return 0;
 }
+
+// predicate for sort call in get_sorted_stripables
+struct StripableByPresentationOrder
+{
+	bool operator () (const boost::shared_ptr<Stripable> & a, const boost::shared_ptr<Stripable> & b) const
+	{
+		return a->presentation_info().order() < b->presentation_info().order();
+	}
+
+	bool operator () (const Stripable & a, const Stripable & b) const
+	{
+		return a.presentation_info().order() < b.presentation_info().order();
+	}
+
+	bool operator () (const Stripable * a, const Stripable * b) const
+	{
+		return a->presentation_info().order() < b->presentation_info().order();
+	}
+};
+
+OSC::Sorted
+OSC::get_sorted_stripables(std::bitset<32> types)
+{
+	Sorted sorted;
+
+	// fetch all stripables
+	StripableList stripables;
+
+	session->get_stripables (stripables);
+
+	// Look for stripables that match bit in sur->strip_types
+	for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
+
+		boost::shared_ptr<Stripable> s = *it;
+		if ((!types[9]) && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
+			// do nothing... skip it
+		} else {
+
+			if (types[0] && (s->presentation_info().flags() & PresentationInfo::AudioTrack)) {
+				sorted.push_back (s);
+			} else
+			if (types[1] && (s->presentation_info().flags() & PresentationInfo::MidiTrack)) {
+				sorted.push_back (s);
+			} else
+			if (types[2] && (s->presentation_info().flags() & PresentationInfo::AudioBus)) {
+				sorted.push_back (s);
+			} else
+			if (types[3] && (s->presentation_info().flags() & PresentationInfo::MidiBus)) {
+				sorted.push_back (s);
+			} else
+			if (types[4] && (s->presentation_info().flags() & PresentationInfo::VCA)) {
+				sorted.push_back (s);
+			} else
+			if (types[8] && (s->presentation_info().flags() & PresentationInfo::Selected)) {
+				sorted.push_back (s);
+			} else
+			if (types[9] && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
+				sorted.push_back (s);
+			}
+		}
+	}
+	sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
+	// Master/Monitor might be anywhere... we put them at the end - Sorry ;)
+	if (types[5]) {
+		sorted.push_back (session->master_out());
+	}
+	if (types[6]) {
+		sorted.push_back (session->monitor_out());
+	}
+	return sorted;
+}
+