smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

OSC: include all of select in feedback[13]

Browse source
This commit is contained in:
Len Ovens 2017-06-30 20:47:42 -07:00
parent 296c9ae03e
commit a967a942d2
2 changed files with 158 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/surfaces/osc/osc.cc
View file

@ -3153,7 +3153,7 @@ OSC::_strip_select (boost::shared_ptr<Stripable> s, lo_address addr)
delete sur->sel_obs;
sur->sel_obs = 0;
}
bool feedback_on = sur->feedback.to_ulong();
bool feedback_on = sur->feedback[13];
if (s && feedback_on) {
OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, sur);
s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);

19
libs/surfaces/osc/osc_select_observer.cc
View file

@ -63,7 +63,6 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
plug_size = 0;
_comp_redux = 1;
if (feedback[0]) { // buttons are separate feedback
_strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::name_changed, this, boost::lambda::_1), OSC::instance());
name_changed (ARDOUR::Properties::name);
@ -107,9 +106,6 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
change_message ("/select/polarity", _strip->phase_control());
}
}
if (feedback[1]) { // level controls
_strip->gain_control()->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_automation, this), OSC::instance());
_strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_message, this), OSC::instance());
gain_automation ();
@ -132,8 +128,6 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
change_message ("/select/pan_stereo_width", _strip->pan_width_control());
}
}
if (feedback[13]) { // Well known controls
// Rest of possible pan controls... Untested because I can't find a way to get them in the GUI :)
if (_strip->pan_elevation_control ()) {
_strip->pan_elevation_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_elevation_position"), _strip->pan_elevation_control()), OSC::instance());
@ -179,7 +173,6 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
change_message ("/select/comp_makeup", _strip->comp_makeup_controllable());
}
}
tick();
}
@ -188,7 +181,6 @@ OSCSelectObserver::~OSCSelectObserver ()
{
strip_connections.drop_connections ();
// all strip buttons should be off and faders 0 and etc.
if (feedback[0]) { // buttons are separate feedback
send_float ("/select/expand", 0);
text_message ("/select/name", " ");
text_message ("/select/comment", " ");
@ -201,8 +193,6 @@ OSCSelectObserver::~OSCSelectObserver ()
send_float ("/select/polarity", 0);
send_float ("/select/n_inputs", 0);
send_float ("/select/n_outputs", 0);
}
if (feedback[1]) { // level controls
if (gainmode) {
send_float ("/select/fader", 0);
} else {
@ -211,7 +201,6 @@ OSCSelectObserver::~OSCSelectObserver ()
send_float ("/select/trimdB", 0);
send_float ("/select/pan_stereo_position", 0.5);
send_float ("/select/pan_stereo_width", 1);
}
if (feedback[9]) {
send_float ("/select/signal", 0);
}
@ -224,7 +213,6 @@ OSCSelectObserver::~OSCSelectObserver ()
}else if (feedback[8]) {
send_float ("/select/meter", 0);
}
if (feedback[13]) { // Well known controls
send_float ("/select/pan_elevation_position", 0);
send_float ("/select/pan_frontback_position", .5);
send_float ("/select/pan_lfe_control", 0);
@ -235,7 +223,6 @@ OSCSelectObserver::~OSCSelectObserver ()
text_message ("/select/comp_mode_name", " ");
text_message ("/select/comp_speed_name", " ");
send_float ("/select/comp_makeup", 0);
}
send_end();
plugin_end();
eq_end();
@ -483,7 +470,6 @@ OSCSelectObserver::tick ()
_last_meter = now_meter;
}
if (feedback[1]) {
if (gain_timeout) {
if (gain_timeout == 1) {
text_message ("/select/name", _strip->name());
@ -497,8 +483,6 @@ OSCSelectObserver::tick ()
gain_message ();
}
}
}
if (feedback[13]) {
if (_strip->comp_redux_controllable() && _strip->comp_enable_controllable() && _strip->comp_enable_controllable()->get_value()) {
float new_value = _strip->comp_redux_controllable()->get_parameter();
if (_comp_redux != new_value) {
@ -515,8 +499,6 @@ OSCSelectObserver::tick ()
send_timeout[i]--;
}
}
}
}
void
@ -838,7 +820,6 @@ OSCSelectObserver::eq_init()
void
OSCSelectObserver::eq_end ()
{
//need to check feedback for [13]
eq_connections.drop_connections ();
if (_strip->filter_freq_controllable (true)) {
send_float ("/select/eq_hpf", 0);