summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2020-03-07 02:31:58 +0100
committerRobin Gareus <robin@gareus.org>2020-03-07 02:33:36 +0100
commit1196eed89d1efe26b239da4355b9895d5f42b998 (patch)
tree91117d81310ac4c64e0ab061409fe9a286258a92 /libs
parent9c97724fc96792a544f4efd1593eaf6e966d3645 (diff)
Remove Mixbus send special case
Mixbus v6 uses AutomationType BusSendLevel like other Sends, however with different min/max range compared to default Ardour Aux sends. Control surfaces should use interface/internal API.
Diffstat (limited to 'libs')
-rw-r--r--libs/surfaces/osc/osc.cc8
-rw-r--r--libs/surfaces/osc/osc_select_observer.cc8
2 files changed, 0 insertions, 16 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index e7dce2cca2..be4e45e409 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -5137,15 +5137,11 @@ OSC::route_set_send_gain_dB (int ssid, int id, float val, lo_message msg)
if (id > 0) {
--id;
}
-#ifdef MIXBUS
- abs = val;
-#else
if (val < -192) {
abs = 0;
} else {
abs = dB_to_coefficient (val);
}
-#endif
if (s->send_level_controllable (id)) {
s->send_level_controllable (id)->set_value (abs, sur->usegroup);
return 0;
@@ -5193,15 +5189,11 @@ OSC::sel_sendgain (int id, float val, lo_message msg)
if (id > 0) {
send_id = id - 1;
}
-#ifdef MIXBUS
- abs = val;
-#else
if (val < -192) {
abs = 0;
} else {
abs = dB_to_coefficient (val);
}
-#endif
if (sur->send_page_size) {
send_id = send_id + ((sur->send_page - 1) * sur->send_page_size);
}
diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc
index d48050a150..b745365134 100644
--- a/libs/surfaces/osc/osc_select_observer.cc
+++ b/libs/surfaces/osc/osc_select_observer.cc
@@ -938,19 +938,11 @@ OSCSelectObserver::send_gain (uint32_t id, boost::shared_ptr<PBD::Controllable>
string path;
float value = 0.0;
float db;
-#ifdef MIXBUS
- if (controllable) {
- db = raw_value;
- } else {
- db = -193;
- }
-#else
if (raw_value < 1e-15) {
db = -193;
} else {
db = accurate_coefficient_to_dB (raw_value);
}
-#endif
if (gainmode) {
if (controllable) {