share buttons IDs where feasible

git-svn-id: svn://localhost/ardour2/branches/3.0@11977 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/surfaces/mackie/button.h b/libs/surfaces/mackie/button.h
index 4928915c71dc2b9cc0a2b666b70b33a4175ec9c9..7e36ac76e5cf31f61239ffe2a197c5eaddb5c948 100644 (file)
--- a/libs/surfaces/mackie/button.h
+++ b/libs/surfaces/mackie/button.h
@@ -126,6 +126,7 @@ public:
                Drop,
                Replace,
                Click,
+               View,
 
                /* Strip buttons */
                

diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc
index 205e112af121ada32c30d936d9685f315d60bc4e..6e1d0274d3eb4a72fdd5acd65d2fc40a5ad30120 100644 (file)
--- a/libs/surfaces/mackie/device_info.cc
+++ b/libs/surfaces/mackie/device_info.cc
@@ -63,35 +63,10 @@ void
 DeviceInfo::mackie_control_buttons ()
 {
        _global_buttons.clear ();
+       shared_buttons ();
 
-       /* these definitions are based on Mackie's specification for Mackie
-        * Control Protocol.
-        *
-        * Any given device info file can override any or all of these for any reason.
-        */
-
-       _global_buttons[Button::Track] = GlobalButtonInfo ("track", "assignment", 0x28);
-       _global_buttons[Button::Send] = GlobalButtonInfo ("send", "assignment", 0x29);
-       _global_buttons[Button::Pan] = GlobalButtonInfo ("pan", "assignment", 0x2a);
-       _global_buttons[Button::Plugin] = GlobalButtonInfo ("plugin", "assignment", 0x2b);
-       _global_buttons[Button::Eq] = GlobalButtonInfo ("eq", "assignment", 0x2c);
-       _global_buttons[Button::Dyn] = GlobalButtonInfo ("dyn", "assignment", 0x2d);
-       _global_buttons[Button::Left] = GlobalButtonInfo ("left", "bank", 0x2e);
-       _global_buttons[Button::Right] = GlobalButtonInfo ("right", "bank", 0x2f);
-       _global_buttons[Button::ChannelLeft] = GlobalButtonInfo ("channelleft", "bank", 0x30);
-       _global_buttons[Button::ChannelRight] = GlobalButtonInfo ("channelright", "bank", 0x31);
-       _global_buttons[Button::Flip] = GlobalButtonInfo ("flip", "none", 0x32);
        _global_buttons[Button::Edit] = GlobalButtonInfo ("edit", "none", 0x33);
-       _global_buttons[Button::NameValue] = GlobalButtonInfo ("name/value", "display", 0x34);
-       _global_buttons[Button::TimecodeBeats] = GlobalButtonInfo ("timecode/beats", "display", 0x35);
-       _global_buttons[Button::F1] = GlobalButtonInfo ("F1", "none", 0x36);
-       _global_buttons[Button::F2] = GlobalButtonInfo ("F2", "none", 0x37);
-       _global_buttons[Button::F3] = GlobalButtonInfo ("F3", "none", 0x38);
-       _global_buttons[Button::F4] = GlobalButtonInfo ("F4", "none", 0x39);
-       _global_buttons[Button::F5] = GlobalButtonInfo ("F5", "none", 0x3a);
-       _global_buttons[Button::F6] = GlobalButtonInfo ("F6", "none", 0x3b);
-       _global_buttons[Button::F7] = GlobalButtonInfo ("F7", "none", 0x3c);
-       _global_buttons[Button::F8] = GlobalButtonInfo ("F8", "none", 0x3d);
+
        _global_buttons[Button::F9] = GlobalButtonInfo ("F9", "none", 0x3e);
        _global_buttons[Button::F10] = GlobalButtonInfo ("F10", "none", 0x3f);
        _global_buttons[Button::F11] = GlobalButtonInfo ("F11", "none", 0x40);
@@ -122,25 +97,7 @@ DeviceInfo::mackie_control_buttons ()
        _global_buttons[Button::PunchOut] = GlobalButtonInfo ("punch out", "transport", 0x59);
        _global_buttons[Button::Loop] = GlobalButtonInfo ("loop", "transport", 0x59);
        _global_buttons[Button::Home] = GlobalButtonInfo ("home", "transport", 0x5a);
-       _global_buttons[Button::Rewind] = GlobalButtonInfo ("rewind", "transport", 0x5b);
-       _global_buttons[Button::Ffwd] = GlobalButtonInfo ("ffwd", "transport", 0x5c);
-       _global_buttons[Button::Stop] = GlobalButtonInfo ("stop", "transport", 0x5d);
-       _global_buttons[Button::Play] = GlobalButtonInfo ("play", "transport", 0x5e);
-       _global_buttons[Button::Record] = GlobalButtonInfo ("record", "transport", 0x5f);
-       _global_buttons[Button::CursorUp] = GlobalButtonInfo ("cursor up", "cursor", 0x60);
-       _global_buttons[Button::CursorDown] = GlobalButtonInfo ("cursor down", "cursor", 0x61);
-       _global_buttons[Button::CursorLeft] = GlobalButtonInfo ("cursor left", "cursor", 0x62);
-       _global_buttons[Button::CursorRight] = GlobalButtonInfo ("cursor right", "cursor", 0x63);
-       _global_buttons[Button::Zoom] = GlobalButtonInfo ("zoom", "none", 0x64);
-       _global_buttons[Button::Scrub] = GlobalButtonInfo ("scrub", "none", 0x65);
-       _global_buttons[Button::UserA] = GlobalButtonInfo ("user a", "user", 0x66);
-       _global_buttons[Button::UserB] = GlobalButtonInfo ("user b", "user", 0x67);
 
-       _strip_buttons[Button::RecEnable], StripButtonInfo (0x0, "recenable");
-       _strip_buttons[Button::Solo] = StripButtonInfo (0x08, "solo");
-       _strip_buttons[Button::Mute] = StripButtonInfo (0x10, "mute");
-       _strip_buttons[Button::Select] = StripButtonInfo (0x18, "select");
-       _strip_buttons[Button::VSelect] = StripButtonInfo (0x20, "vselect");
        _strip_buttons[Button::FaderTouch] = StripButtonInfo (0xe0, "fader touch");
 }
 
@@ -148,37 +105,10 @@ void
 DeviceInfo::logic_control_buttons ()
 {
        _global_buttons.clear ();
+       shared_buttons ();
 
-       /* these definitions are based on Mackie's specification for Mackie
-        * Control Protocol, Logic Control "variant" and corroborated 
-        * with Apple's Logic Control manual.
-        *
-        * Any given device info file can override any or all of these for any reason.
-        */
+       _global_buttons[Button::View] = GlobalButtonInfo ("view", "view", 0x33);
 
-       _global_buttons[Button::Track] = GlobalButtonInfo ("track", "assignment", 0x2a);
-       _global_buttons[Button::Send] = GlobalButtonInfo ("send", "assignment", 0x2b);
-       _global_buttons[Button::Pan] = GlobalButtonInfo ("pan", "assignment", 0x2a);
-       _global_buttons[Button::Plugin] = GlobalButtonInfo ("plugin", "assignment", 0x2b);
-       _global_buttons[Button::Eq] = GlobalButtonInfo ("eq", "assignment", 0x2c);
-       _global_buttons[Button::Dyn] = GlobalButtonInfo ("dyn", "assignment", 0x2d);
-       _global_buttons[Button::Left] = GlobalButtonInfo ("left", "bank", 0x2e);
-       _global_buttons[Button::Right] = GlobalButtonInfo ("right", "bank", 0x2f);
-       _global_buttons[Button::ChannelLeft] = GlobalButtonInfo ("channel left", "bank", 0x30);
-       _global_buttons[Button::ChannelRight] = GlobalButtonInfo ("channelright", "bank", 0x31);
-       _global_buttons[Button::Flip] = GlobalButtonInfo ("flip", "none", 0x32);
-       _global_buttons[Button::Edit] = GlobalButtonInfo ("edit", "none", 0x33);
-       _global_buttons[Button::NameValue] = GlobalButtonInfo ("name/value", "display", 0x34);
-       _global_buttons[Button::TimecodeBeats] = GlobalButtonInfo ("timecode/beats", "display", 0x35);
-       _global_buttons[Button::F1] = GlobalButtonInfo ("F1", "none", 0x36);
-       _global_buttons[Button::F2] = GlobalButtonInfo ("F2", "none", 0x37);
-       _global_buttons[Button::F3] = GlobalButtonInfo ("F3", "none", 0x38);
-       _global_buttons[Button::F4] = GlobalButtonInfo ("F4", "none", 0x39);
-       _global_buttons[Button::F5] = GlobalButtonInfo ("F5", "none", 0x3a);
-       _global_buttons[Button::F6] = GlobalButtonInfo ("F6", "none", 0x3b);
-       _global_buttons[Button::F7] = GlobalButtonInfo ("F7", "none", 0x3c);
-       _global_buttons[Button::F8] = GlobalButtonInfo ("F8", "none", 0x3d);
-       /**/
        _global_buttons[Button::MidiTracks] = GlobalButtonInfo ("miditracks", "view", 0x3e);
        _global_buttons[Button::Inputs] = GlobalButtonInfo ("inputs", "view", 0x3f);
        _global_buttons[Button::AudioTracks] = GlobalButtonInfo ("audiotracks", "view", 0x40);
@@ -208,6 +138,36 @@ DeviceInfo::logic_control_buttons ()
        _global_buttons[Button::Replace] = GlobalButtonInfo ("replace", "transport", 0x58);
        _global_buttons[Button::Click] = GlobalButtonInfo ("click", "transport", 0x59);
        _global_buttons[Button::Solo] = GlobalButtonInfo ("solo", "transport", 0x5a);
+
+       _strip_buttons[Button::FaderTouch] = StripButtonInfo (0x68, "fader touch");
+}
+
+void
+DeviceInfo::shared_buttons ()
+{
+       _global_buttons[Button::Track] = GlobalButtonInfo ("track", "assignment", 0x28);
+       _global_buttons[Button::Send] = GlobalButtonInfo ("send", "assignment", 0x29);
+       _global_buttons[Button::Pan] = GlobalButtonInfo ("pan", "assignment", 0x2a);
+       _global_buttons[Button::Plugin] = GlobalButtonInfo ("plugin", "assignment", 0x2b);
+       _global_buttons[Button::Eq] = GlobalButtonInfo ("eq", "assignment", 0x2c);
+       _global_buttons[Button::Dyn] = GlobalButtonInfo ("dyn", "assignment", 0x2d);
+       _global_buttons[Button::Left] = GlobalButtonInfo ("left", "bank", 0x2e);
+       _global_buttons[Button::Right] = GlobalButtonInfo ("right", "bank", 0x2f);
+       _global_buttons[Button::ChannelLeft] = GlobalButtonInfo ("channelleft", "bank", 0x30);
+       _global_buttons[Button::ChannelRight] = GlobalButtonInfo ("channelright", "bank", 0x31);
+       _global_buttons[Button::Flip] = GlobalButtonInfo ("flip", "none", 0x32);
+
+       _global_buttons[Button::NameValue] = GlobalButtonInfo ("name/value", "display", 0x34);
+       _global_buttons[Button::TimecodeBeats] = GlobalButtonInfo ("timecode/beats", "display", 0x35);
+       _global_buttons[Button::F1] = GlobalButtonInfo ("F1", "none", 0x36);
+       _global_buttons[Button::F2] = GlobalButtonInfo ("F2", "none", 0x37);
+       _global_buttons[Button::F3] = GlobalButtonInfo ("F3", "none", 0x38);
+       _global_buttons[Button::F4] = GlobalButtonInfo ("F4", "none", 0x39);
+       _global_buttons[Button::F5] = GlobalButtonInfo ("F5", "none", 0x3a);
+       _global_buttons[Button::F6] = GlobalButtonInfo ("F6", "none", 0x3b);
+       _global_buttons[Button::F7] = GlobalButtonInfo ("F7", "none", 0x3c);
+       _global_buttons[Button::F8] = GlobalButtonInfo ("F8", "none", 0x3d);
+
        _global_buttons[Button::Rewind] = GlobalButtonInfo ("rewind", "transport", 0x5b);
        _global_buttons[Button::Ffwd] = GlobalButtonInfo ("ffwd", "transport", 0x5c);
        _global_buttons[Button::Stop] = GlobalButtonInfo ("stop", "transport", 0x5d);
@@ -227,7 +187,6 @@ DeviceInfo::logic_control_buttons ()
        _strip_buttons[Button::Mute] = StripButtonInfo (0x10, "mute");
        _strip_buttons[Button::Select] = StripButtonInfo (0x18, "select");
        _strip_buttons[Button::VSelect] = StripButtonInfo (0x20, "vselect");
-       _strip_buttons[Button::FaderTouch] = StripButtonInfo (0x68, "fader touch");
 }
 
 int

diff --git a/libs/surfaces/mackie/device_info.h b/libs/surfaces/mackie/device_info.h
index 7b279565db174e45ebb9e3746e1421e0ae2186be..e7f0bc71666307d6344404507ea52cb960e101a7 100644 (file)
--- a/libs/surfaces/mackie/device_info.h
+++ b/libs/surfaces/mackie/device_info.h
@@ -93,6 +93,7 @@ class DeviceInfo
 
     void logic_control_buttons ();
     void mackie_control_buttons ();
+    void shared_buttons ();
 };
 
 class DeviceProfile

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index ae755595193131fa34e8e38eb5dc57ce914ee661..c0ad5fde1f6428398e9ea83bcca572a7e98c8625 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -1067,6 +1067,7 @@ MackieControlProtocol::build_button_map ()
        DEFINE_BUTTON_HANDLER (Button::Drop, &MackieControlProtocol::drop_press, &MackieControlProtocol::drop_release);
        DEFINE_BUTTON_HANDLER (Button::Replace, &MackieControlProtocol::replace_press, &MackieControlProtocol::replace_release);
        DEFINE_BUTTON_HANDLER (Button::Click, &MackieControlProtocol::click_press, &MackieControlProtocol::click_release);
+       DEFINE_BUTTON_HANDLER (Button::View, &MackieControlProtocol::view_press, &MackieControlProtocol::view_release);
 }
 
 void 

diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index c2c960905d7fca0c7115e99ebd1ffb21d78c5a78..cab0521a54eed19266bc07754eb3653d9d9d84e9 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -485,7 +485,8 @@ class MackieControlProtocol
        Mackie::LedState replace_release (Mackie::Button&);
        Mackie::LedState click_press (Mackie::Button&);
        Mackie::LedState click_release (Mackie::Button&);
-
+       Mackie::LedState view_press (Mackie::Button&);
+       Mackie::LedState view_release (Mackie::Button&);
 };
 
 

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index d3f09375a78a72c0c82a8a573034ce902a48b3dc..5999220c5250c111eb7c318f8dd6a1bda20a5172 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -1211,3 +1211,13 @@ MackieControlProtocol::click_release (Mackie::Button&)
 {
        return none;
 }
+Mackie::LedState 
+MackieControlProtocol::view_press (Mackie::Button&) 
+{
+       return none;
+}
+Mackie::LedState 
+MackieControlProtocol::view_release (Mackie::Button&) 
+{
+       return none;
+}