diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-02 08:08:14 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-02 08:08:14 -0500 |
| commit | 4c13018656b2c655025c733a4056b53c3a93e941 (patch) | |
| tree | f05d692eb4dd13b378ba1b3ea4648e6e6d63c7fd /libs | |
| parent | 36b11098a209bcf9372bb83169a9ffa2ce68af59 (diff) | |
mackie: fix display of send level/fader level in send subview
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/mackie/strip.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index a2e7b9f9ac..d7f5c90fc7 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -351,18 +351,15 @@ Strip::notify_gain_changed (bool force_update) if (force_update || normalized_position != _last_gain_position_written) { - if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) { - if (!control->in_use()) { + if (!control->in_use()) { + if (control == _vpot) { _surface->write (_vpot->set (normalized_position, true, Pot::wrap)); - } - do_parameter_display (GainAutomation, gain_coefficient); - } else { - if (!control->in_use()) { + } else { _surface->write (_fader->set_position (normalized_position)); } - do_parameter_display (GainAutomation, gain_coefficient); } + do_parameter_display (GainAutomation, gain_coefficient); _last_gain_position_written = normalized_position; } } @@ -435,8 +432,11 @@ Strip::notify_send_level_change (AutomationType type, uint32_t send_num, bool fo if (control) { float val = control->get_value(); do_parameter_display (type, val); - /* update pot/encoder */ - _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap)); + + if (_vpot->control() == control) { + /* update pot/encoder */ + _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap)); + } } } |