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

MCU: Remove use of AutomationType as ID, part two.

Browse source 
This may need some small tweaks for MB channelstrip to set
print-format (like LV2 plugins would) for cases where the default
value_as_string() differs.
This commit is contained in:
Robin Gareus 2017-06-23 15:58:50 +02:00
parent 5e5f7a55ee
commit 66a3dd7ded
2 changed files with 31 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

125
libs/surfaces/mackie/strip.cc
View file

@ -53,6 +53,7 @@
#include "ardour/midi_track.h" #include "ardour/midi_track.h"
#include "ardour/user_bundle.h" #include "ardour/user_bundle.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "ardour/value_as_string.h"
#include "mackie_control_protocol.h" #include "mackie_control_protocol.h"
#include "surface_port.h" #include "surface_port.h"
@ -361,7 +362,7 @@ Strip::notify_gain_changed (bool force_update)
} }
} }
do_parameter_display (GainAutomation, gain_coefficient); do_parameter_display (ac->desc(), gain_coefficient); // GainAutomation
_last_gain_position_written = normalized_position; _last_gain_position_written = normalized_position;
} }
} }
@ -433,7 +434,7 @@ Strip::notify_send_level_change (uint32_t send_num, bool force_update)
if (control) { if (control) {
float val = control->get_value(); float val = control->get_value();
do_parameter_display (control->desc().type, val); do_parameter_display (control->desc (), val); // BusSendLevel
if (_vpot->control() == control) { if (_vpot->control() == control) {
/* update pot/encoder */ /* update pot/encoder */
@ -459,10 +460,12 @@ Strip::notify_trackview_change (AutomationType type, uint32_t send_num, bool for
boost::shared_ptr<AutomationControl> control; boost::shared_ptr<AutomationControl> control;
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (r); boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (r);
bool screen_hold = false;
switch (type) { switch (type) {
case TrimAutomation: case TrimAutomation:
control = r->trim_control(); control = r->trim_control();
screen_hold = true;
break; break;
case SoloIsolateAutomation: case SoloIsolateAutomation:
control = r->solo_isolate_control (); control = r->solo_isolate_control ();
@ -473,10 +476,12 @@ Strip::notify_trackview_change (AutomationType type, uint32_t send_num, bool for
case MonitoringAutomation: case MonitoringAutomation:
if (track) { if (track) {
control = track->monitoring_control(); control = track->monitoring_control();
screen_hold = true;
} }
break; break;
case PhaseAutomation: case PhaseAutomation:
control = r->phase_control (); control = r->phase_control ();
screen_hold = true;
break; break;
default: default:
break; break;
@ -490,7 +495,7 @@ Strip::notify_trackview_change (AutomationType type, uint32_t send_num, bool for
* into the normalized 0..1.0 ("interface") range. * into the normalized 0..1.0 ("interface") range.
*/ */
do_parameter_display (type, val); do_parameter_display (control->desc(), val, screen_hold);
/* update pot/encoder */ /* update pot/encoder */
_surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap)); _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
} }
@ -514,7 +519,7 @@ Strip::notify_eq_change (boost::weak_ptr<AutomationControl> pc, bool force_updat
boost::shared_ptr<AutomationControl> control = pc.lock (); boost::shared_ptr<AutomationControl> control = pc.lock ();
if (control) { if (control) {
float val = control->get_value(); float val = control->get_value();
do_parameter_display (control->desc().type, val); do_parameter_display (control->desc(), val, true);
/* update pot/encoder */ /* update pot/encoder */
_surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap)); _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
} }
@ -544,7 +549,11 @@ Strip::notify_dyn_change (boost::weak_ptr<AutomationControl> pc, bool force_upda
if (control) { if (control) {
float val = control->get_value(); float val = control->get_value();
do_parameter_display (control->desc().type, val); if (control == r->comp_mode_controllable ()) {
pending_display[1] = r->comp_mode_name (val);
} else {
do_parameter_display (control->desc(), val, true);
}
/* update pot/encoder */ /* update pot/encoder */
_surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap)); _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
} }
@ -579,7 +588,7 @@ Strip::notify_panner_azi_changed (bool force_update)
_surface->write (_vpot->set (normalized_pos, true, Pot::dot)); _surface->write (_vpot->set (normalized_pos, true, Pot::dot));
/* show actual internal value to user */ /* show actual internal value to user */
do_parameter_display (PanAzimuthAutomation, internal_pos); do_parameter_display (pan_control->desc(), internal_pos); // PanAzimuthAutomation
_last_pan_azi_position_written = normalized_pos; _last_pan_azi_position_written = normalized_pos;
} }
@ -612,7 +621,7 @@ Strip::notify_panner_width_changed (bool force_update)
if (force_update || pos != _last_pan_width_position_written) { if (force_update || pos != _last_pan_width_position_written) {
_surface->write (_vpot->set (pos, true, Pot::spread)); _surface->write (_vpot->set (pos, true, Pot::spread));
do_parameter_display (PanWidthAutomation, pos); do_parameter_display (pan_control->desc(), pos); // PanWidthAutomation
_last_pan_width_position_written = pos; _last_pan_width_position_written = pos;
} }
@ -718,7 +727,7 @@ Strip::vselect_event (Button&, ButtonState bs)
/* we just turned it on, show the level /* we just turned it on, show the level
*/ */
control = _stripable->send_level_controllable (global_pos); control = _stripable->send_level_controllable (global_pos);
do_parameter_display (BusSendLevel, control->get_value()); do_parameter_display (control->desc(), control->get_value()); // BusSendLevel
} }
} }
} }
@ -784,7 +793,7 @@ Strip::fader_touch_event (Button&, ButtonState bs)
_fader->start_touch (_surface->mcp().transport_frame()); _fader->start_touch (_surface->mcp().transport_frame());
if (ac) { if (ac) {
do_parameter_display ((AutomationType) ac->parameter().type(), ac->get_value()); do_parameter_display (ac->desc(), ac->get_value());
} }
} else { } else {
@ -866,13 +875,14 @@ Strip::handle_button (Button& button, ButtonState bs)
} }
void void
Strip::do_parameter_display (AutomationType type, float val) Strip::do_parameter_display (ARDOUR::ParameterDescriptor const& desc, float val, bool screen_hold)
{ {
bool screen_hold = false;
char buf[16]; char buf[16];
switch (type) { switch (desc.type) {
case GainAutomation: case GainAutomation:
case TrimAutomation:
// we can't use value_as_string() that'll suffix "dB" and also use "-inf" w/o space :(
if (val == 0.0) { if (val == 0.0) {
pending_display[1] = " -inf "; pending_display[1] = " -inf ";
} else { } else {
@ -885,6 +895,7 @@ Strip::do_parameter_display (AutomationType type, float val)
case BusSendLevel: case BusSendLevel:
if (Profile->get_mixbus()) { //Mixbus sends are already stored in dB if (Profile->get_mixbus()) { //Mixbus sends are already stored in dB
// TODO remove after merge - PluginAutomation w/print_fmt
snprintf (buf, sizeof (buf), "%2.1f", val); snprintf (buf, sizeof (buf), "%2.1f", val);
pending_display[1] = buf; pending_display[1] = buf;
screen_hold = true; screen_hold = true;
@ -902,6 +913,7 @@ Strip::do_parameter_display (AutomationType type, float val)
case PanAzimuthAutomation: case PanAzimuthAutomation:
if (Profile->get_mixbus()) { if (Profile->get_mixbus()) {
// XXX no _stripable check?
snprintf (buf, sizeof (buf), "%2.1f", val); snprintf (buf, sizeof (buf), "%2.1f", val);
pending_display[1] = buf; pending_display[1] = buf;
screen_hold = true; screen_hold = true;
@ -915,88 +927,11 @@ Strip::do_parameter_display (AutomationType type, float val)
} }
} }
break; break;
case PanWidthAutomation:
if (_stripable) {
snprintf (buf, sizeof (buf), "%5ld%%", lrintf ((val * 200.0)-100));
pending_display[1] = buf;
screen_hold = true;
}
break;
case TrimAutomation:
if (_stripable) {
float dB = accurate_coefficient_to_dB (val);
snprintf (buf, sizeof (buf), "%6.1f", dB);
pending_display[1] = buf;
screen_hold = true;
}
break;
case PhaseAutomation:
if (_stripable) {
if (val < 0.5) {
pending_display[1] = "Normal";
} else {
pending_display[1] = "Invert";
}
screen_hold = true;
}
break;
case EQGain:
case EQFrequency:
case EQQ:
case EQShape:
case EQHPF:
case EQLPF:
case CompThreshold:
case CompSpeed:
case CompMakeup:
case CompRedux:
snprintf (buf, sizeof (buf), "%6.1f", val);
pending_display[1] = buf;
screen_hold = true;
break;
case EQFilterEnable:
case EQEnable:
case CompEnable:
if (val >= 0.5) {
pending_display[1] = "on";
} else {
pending_display[1] = "off";
}
break;
case CompMode:
if (_surface->mcp().subview_stripable()) {
pending_display[1] = _surface->mcp().subview_stripable()->comp_mode_name (val);
}
break;
case SoloSafeAutomation:
case SoloIsolateAutomation:
if (val >= 0.5) {
pending_display[1] = "on";
} else {
pending_display[1] = "off";
}
break;
case MonitoringAutomation:
switch (MonitorChoice ((int) val)) {
case MonitorAuto:
pending_display[1] = "auto";
break;
case MonitorInput:
pending_display[1] = "input";
break;
case MonitorDisk:
pending_display[1] = "disk";
break;
case MonitorCue: /* XXX not implemented as of jan 2016 */
pending_display[1] = "cue";
break;
}
break;
default: default:
pending_display[1] = ARDOUR::value_as_string (desc, val);
if (pending_display[1].size () < 6) { // left-padding, right-align
pending_display[1].insert (0, 6 - pending_display[1].size (), ' ');
}
break; break;
} }
@ -1329,9 +1264,9 @@ Strip::flip_mode_changed ()
if (_surface->mcp().flip_mode() == MackieControlProtocol::Normal) { if (_surface->mcp().flip_mode() == MackieControlProtocol::Normal) {
do_parameter_display (GainAutomation, fader_control->get_value()); do_parameter_display (fader_control->desc(), fader_control->get_value());
} else { } else {
do_parameter_display (BusSendLevel, pot_control->get_value()); do_parameter_display (pot_control->desc(), pot_control->get_value()); // BusSendLevel
} }
} }

2
libs/surfaces/mackie/strip.h
View file

@ -146,7 +146,7 @@ private:
void return_to_vpot_mode_display (); void return_to_vpot_mode_display ();
void next_pot_mode (); void next_pot_mode ();
void do_parameter_display (ARDOUR::AutomationType, float val); void do_parameter_display (ARDOUR::ParameterDescriptor const&, float val, bool screen_hold = false);
void select_event (Button&, ButtonState); void select_event (Button&, ButtonState);
void vselect_event (Button&, ButtonState); void vselect_event (Button&, ButtonState);
void fader_touch_event (Button&, ButtonState); void fader_touch_event (Button&, ButtonState);