From 04029a656ee274bb0f328dc3ccfc146a6f1df88f Mon Sep 17 00:00:00 2001
From: Len Ovens <len@ovenwerks.net>
Date: Thu, 28 Jul 2016 07:44:58 -0700
Subject: [PATCH] OSC: MB spelling mistakes stopped compile fix

---
 libs/surfaces/osc/osc.cc                 | 16 ++++++++--------
 libs/surfaces/osc/osc_select_observer.cc | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 5d05372931..74f3212d47 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -2377,6 +2377,9 @@ OSC::route_set_send_gain_dB (int ssid, int id, float val, lo_message msg)
 	boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
 	float abs;
 	if (s) {
+		if (id > 0) {
+			--id;
+		}
 #ifdef MIXBUS
 		abs = val;
 #else
@@ -2385,9 +2388,6 @@ OSC::route_set_send_gain_dB (int ssid, int id, float val, lo_message msg)
 		} else {
 			abs = dB_to_coefficient (val);
 		}
-		if (id > 0) {
-			--id;
-		}
 #endif
 		if (s->send_level_controllable (id)) {
 			s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
@@ -2413,7 +2413,7 @@ OSC::route_set_send_fader (int ssid, int id, float val, lo_message msg)
 
 		if (s->send_level_controllable (id)) {
 #ifdef MIXBUS
-			abs = s->send_level_control(id)->interface_to_internal (val);
+			abs = s->send_level_controllable(id)->interface_to_internal (val);
 #else
 			abs = slider_position_to_gain_with_max (val, 2.0);
 #endif
@@ -2436,6 +2436,9 @@ OSC::sel_sendgain (int id, float val, lo_message msg)
 	}
 	float abs;
 	if (s) {
+		if (id > 0) {
+			--id;
+		}
 #ifdef MIXBUS
 		abs = val;
 #else
@@ -2444,9 +2447,6 @@ OSC::sel_sendgain (int id, float val, lo_message msg)
 		} else {
 			abs = dB_to_coefficient (val);
 		}
-		if (id > 0) {
-			--id;
-		}
 #endif
 		if (s->send_level_controllable (id)) {
 			s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
@@ -2475,7 +2475,7 @@ OSC::sel_sendfader (int id, float val, lo_message msg)
 
 		if (s->send_level_controllable (id)) {
 #ifdef MIXBUS
-			abs = s->send_level_control(id)->interface_to_internal (val);
+			abs = s->send_level_controllable(id)->interface_to_internal (val);
 #else
 			abs = slider_position_to_gain_with_max (val, 2.0);
 #endif
diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc
index 7f50c71106..3224b5e880 100644
--- a/libs/surfaces/osc/osc_select_observer.cc
+++ b/libs/surfaces/osc/osc_select_observer.cc
@@ -438,21 +438,13 @@ OSCSelectObserver::gain_message (string path, boost::shared_ptr<Controllable> co
 	lo_message msg = lo_message_new ();
 
 	if (gainmode) {
-#ifdef MIXBUS
-		lo_message_add_float (msg, controllable->internal_to_interface (val));
-#else
 		lo_message_add_float (msg, gain_to_slider_position (controllable->get_value()));
-#endif
 	} else {
-#ifdef MIXBUS
-		lo_message_add_float (msg, val);
-#else
 		if (controllable->get_value() < 1e-15) {
 			lo_message_add_float (msg, -200);
 		} else {
 			lo_message_add_float (msg, accurate_coefficient_to_dB (controllable->get_value()));
 		}
-#endif
 	}
 
 	lo_send_message (addr, path.c_str(), msg);
@@ -468,14 +460,22 @@ OSCSelectObserver::send_gain (uint32_t id, boost::shared_ptr<PBD::Controllable>
 
 	if (gainmode) {
 		path = "/select/send_fader";
+#ifdef MIXBUS
+		value = controllable->internal_to_interface (controllable->get_value());
+#else
 		value = gain_to_slider_position (controllable->get_value());
+#endif
 	} else {
 		path = "/select/send_gain";
+#ifdef MIXBUS
+		value = controllable->get_value();
+#else
 		if (controllable->get_value() < 1e-15) {
 			value = -193;
 		} else {
 			value = accurate_coefficient_to_dB (controllable->get_value());
 		}
+#endif
 	}
 
 	if (feedback[2]) {