diff options
author | Robin Gareus <robin@gareus.org> | 2019-04-13 19:19:29 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-04-13 19:19:29 +0200 |
commit | 2f91bdfa5390bdf992ab7044488b5afb21716661 (patch) | |
tree | 3418e802cdbb431cc10c65eb5dfcbbc6925d5984 /libs/surfaces/us2400 | |
parent | 31815b5f268fa0233cd25b7ff2c8a246c12c20d1 (diff) |
NO-OP: <tab> after <space> fixes in libs
Diffstat (limited to 'libs/surfaces/us2400')
-rw-r--r-- | libs/surfaces/us2400/device_info.cc | 13 | ||||
-rw-r--r-- | libs/surfaces/us2400/strip.cc | 53 | ||||
-rw-r--r-- | libs/surfaces/us2400/strip.h | 2 |
3 files changed, 40 insertions, 28 deletions
diff --git a/libs/surfaces/us2400/device_info.cc b/libs/surfaces/us2400/device_info.cc index d1a042fcbb..d712ea7f4d 100644 --- a/libs/surfaces/us2400/device_info.cc +++ b/libs/surfaces/us2400/device_info.cc @@ -109,11 +109,12 @@ DeviceInfo::logic_control_buttons () void DeviceInfo::shared_buttons () { -// US-2499 button notes: -// CHAN button sends nothing. it inititates a dumb 0..127 knob mode for the 24 knobs -// PAN sends the regular pan/surround message. this tells our strips to send the pan knob position -// AUX1-6 all send the same 0x29 + 0x21 message, I believe the surface uses this to captures knob info, somehow - + /* US-2499 button notes: + * CHAN button sends nothing. it inititates a dumb 0..127 knob mode for the 24 knobs + * PAN sends the regular pan/surround message. this tells our strips to send the pan knob position + * AUX1-6 all send the same 0x29 + 0x21 message, I believe the surface uses this to captures knob info, somehow + */ + _global_buttons[Button::Pan] = GlobalButtonInfo ("Pan/Surround", "assignment", 0x2a); // US-2400: this is sent (on&off in one msg) from the Pan button _global_buttons[Button::Left] = GlobalButtonInfo ("Bank Left", "bank", 0x2e); @@ -300,7 +301,7 @@ static Searchpath devinfo_search_path () { bool devinfo_path_defined = false; - std::string spath_env (Glib::getenv (devinfo_env_variable_name, devinfo_path_defined)); + std::string spath_env (Glib::getenv (devinfo_env_variable_name, devinfo_path_defined)); if (devinfo_path_defined) { return spath_env; diff --git a/libs/surfaces/us2400/strip.cc b/libs/surfaces/us2400/strip.cc index bc270df024..8298ff3a93 100644 --- a/libs/surfaces/us2400/strip.cc +++ b/libs/surfaces/us2400/strip.cc @@ -263,14 +263,18 @@ Strip::reset_stripable () void Strip::notify_all() { -// if (!_stripable) { -// zero (); -// return; -// } +#if 0 + if (!_stripable) { + zero (); + return; + } +#endif // The active V-pot control may not be active for this strip // But if we zero it in the controls function it may erase // the one we do want -// _surface->write (_vpot->zero()); +#if 0 + _surface->write (_vpot->zero()); +#endif notify_solo_changed (); notify_mute_changed (); @@ -281,15 +285,19 @@ Strip::notify_all() notify_vpot_change (); notify_panner_width_changed (); notify_record_enable_changed (); -// notify_processor_changed (); +#if 0 + notify_processor_changed (); +#endif } void Strip::notify_solo_changed () { -// if (_stripable && _solo) { -// _surface->write (_solo->set_state (_stripable->solo_control()->soloed() ? on : off)); -// } +#if 0 + if (_stripable && _solo) { + _surface->write (_solo->set_state (_stripable->solo_control()->soloed() ? on : off)); + } +#endif _solo->mark_dirty (); _trickle_counter = 0; @@ -299,14 +307,16 @@ void Strip::notify_mute_changed () { DEBUG_TRACE (DEBUG::US2400, string_compose ("Strip %1 mute changed\n", _index)); -// if (_stripable && _mute) { -// DEBUG_TRACE (DEBUG::US2400, string_compose ("\tstripable muted ? %1\n", _stripable->mute_control()->muted())); -// DEBUG_TRACE (DEBUG::US2400, string_compose ("mute message: %1\n", _mute->set_state (_stripable->mute_control()->muted() ? on : off))); -// -// _surface->write (_mute->set_state (_stripable->mute_control()->muted() ? on : off)); -// } else { -// _surface->write (_mute->zero()); -// } +#if 0 + if (_stripable && _mute) { + DEBUG_TRACE (DEBUG::US2400, string_compose ("\tstripable muted ? %1\n", _stripable->mute_control()->muted())); + DEBUG_TRACE (DEBUG::US2400, string_compose ("mute message: %1\n", _mute->set_state (_stripable->mute_control()->muted() ? on : off))); + + _surface->write (_mute->set_state (_stripable->mute_control()->muted() ? on : off)); + } else { + _surface->write (_mute->zero()); + } +#endif _mute->mark_dirty (); _trickle_counter = 0; @@ -346,10 +356,11 @@ Strip::update_selection_state () { _select->mark_dirty (); _trickle_counter = 0; - -// if(_stripable) { -// _surface->write (_select->set_state (_stripable->is_selected())); -// } +#if 0 + if(_stripable) { + _surface->write (_select->set_state (_stripable->is_selected())); + } +#endif } void diff --git a/libs/surfaces/us2400/strip.h b/libs/surfaces/us2400/strip.h index d963c12836..bc598e802b 100644 --- a/libs/surfaces/us2400/strip.h +++ b/libs/surfaces/us2400/strip.h @@ -113,7 +113,7 @@ private: PBD::ScopedConnectionList send_connections; int eq_band; - int _trickle_counter; + int _trickle_counter; ARDOUR::AutomationType _pan_mode; |