From 32766ce215fc2c668c65a54dc1d9436cd11ca413 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 14 Apr 2012 11:39:25 +0000 Subject: [PATCH] MCP: hack test for ssl nucleus fader touch git-svn-id: svn://localhost/ardour2/branches/3.0@11970 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/surfaces/mackie/button.h | 2 +- libs/surfaces/mackie/strip.cc | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/surfaces/mackie/button.h b/libs/surfaces/mackie/button.h index 1f7d6d2fe7..2702452750 100644 --- a/libs/surfaces/mackie/button.h +++ b/libs/surfaces/mackie/button.h @@ -36,7 +36,7 @@ public: mute_base_id = 0x10, select_base_id = 0x18, vselect_base_id = 0x20, - fader_touch_base_id = 0xe0, + fader_touch_base_id = 0x68, // 0xe0, }; enum ButtonID { diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 82a3e07ab4..dc7a15fe6a 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -417,9 +417,7 @@ Strip::handle_button (Button& button, ButtonState bs) } if ((button.id() >= Button::fader_touch_base_id && - button.id() < Button::fader_touch_base_id + 8) || - /* Hack for SSL Nucleus */ - (button.id() >= 104 && button.id() < 112)) { + button.id() < Button::fader_touch_base_id + 8)) { DEBUG_TRACE (DEBUG::MackieControl, string_compose ("fader touch, press ? %1\n", (bs == press))); -- 2.30.2