MCU: F-keys are reserved only for user-defined actions; no need for explicit handling.

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 486adb7fa2841f088aed3f24e0f6f59d4ec30f88..e50d098882c54da60cdd291a0ea030d9d9785909 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -1464,14 +1464,14 @@ MackieControlProtocol::build_button_map ()
        DEFINE_BUTTON_HANDLER (Button::View, &MackieControlProtocol::view_press, &MackieControlProtocol::view_release);
        DEFINE_BUTTON_HANDLER (Button::NameValue, &MackieControlProtocol::name_value_press, &MackieControlProtocol::name_value_release);
        DEFINE_BUTTON_HANDLER (Button::TimecodeBeats, &MackieControlProtocol::timecode_beats_press, &MackieControlProtocol::timecode_beats_release);
-       DEFINE_BUTTON_HANDLER (Button::F1, &MackieControlProtocol::F1_press, &MackieControlProtocol::F1_release);
-       DEFINE_BUTTON_HANDLER (Button::F2, &MackieControlProtocol::F2_press, &MackieControlProtocol::F2_release);
-       DEFINE_BUTTON_HANDLER (Button::F3, &MackieControlProtocol::F3_press, &MackieControlProtocol::F3_release);
-       DEFINE_BUTTON_HANDLER (Button::F4, &MackieControlProtocol::F4_press, &MackieControlProtocol::F4_release);
-       DEFINE_BUTTON_HANDLER (Button::F5, &MackieControlProtocol::F5_press, &MackieControlProtocol::F5_release);
-       DEFINE_BUTTON_HANDLER (Button::F6, &MackieControlProtocol::F6_press, &MackieControlProtocol::F6_release);
-       DEFINE_BUTTON_HANDLER (Button::F7, &MackieControlProtocol::F7_press, &MackieControlProtocol::F7_release);
-       DEFINE_BUTTON_HANDLER (Button::F8, &MackieControlProtocol::F8_press, &MackieControlProtocol::F8_release);
+//     DEFINE_BUTTON_HANDLER (Button::F1, &MackieControlProtocol::F1_press, &MackieControlProtocol::F1_release);
+//     DEFINE_BUTTON_HANDLER (Button::F2, &MackieControlProtocol::F2_press, &MackieControlProtocol::F2_release);
+//     DEFINE_BUTTON_HANDLER (Button::F3, &MackieControlProtocol::F3_press, &MackieControlProtocol::F3_release);
+//     DEFINE_BUTTON_HANDLER (Button::F4, &MackieControlProtocol::F4_press, &MackieControlProtocol::F4_release);
+//     DEFINE_BUTTON_HANDLER (Button::F5, &MackieControlProtocol::F5_press, &MackieControlProtocol::F5_release);
+//     DEFINE_BUTTON_HANDLER (Button::F6, &MackieControlProtocol::F6_press, &MackieControlProtocol::F6_release);
+//     DEFINE_BUTTON_HANDLER (Button::F7, &MackieControlProtocol::F7_press, &MackieControlProtocol::F7_release);
+//     DEFINE_BUTTON_HANDLER (Button::F8, &MackieControlProtocol::F8_press, &MackieControlProtocol::F8_release);
        DEFINE_BUTTON_HANDLER (Button::MidiTracks, &MackieControlProtocol::miditracks_press, &MackieControlProtocol::miditracks_release);
        DEFINE_BUTTON_HANDLER (Button::Inputs, &MackieControlProtocol::inputs_press, &MackieControlProtocol::inputs_release);
        DEFINE_BUTTON_HANDLER (Button::AudioTracks, &MackieControlProtocol::audiotracks_press, &MackieControlProtocol::audiotracks_release);

diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 943ccf0850995b808b129e606860b9509029f59b..2c649a179a9223649feda1650e7881dda33d62b7 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -443,22 +443,22 @@ class MackieControlProtocol
        Mackie::LedState flip_release (Mackie::Button &);
        Mackie::LedState name_value_press (Mackie::Button &);
        Mackie::LedState name_value_release (Mackie::Button &);
-       Mackie::LedState F1_press (Mackie::Button &);
-       Mackie::LedState F1_release (Mackie::Button &);
-       Mackie::LedState F2_press (Mackie::Button &);
-       Mackie::LedState F2_release (Mackie::Button &);
-       Mackie::LedState F3_press (Mackie::Button &);
-       Mackie::LedState F3_release (Mackie::Button &);
-       Mackie::LedState F4_press (Mackie::Button &);
-       Mackie::LedState F4_release (Mackie::Button &);
-       Mackie::LedState F5_press (Mackie::Button &);
-       Mackie::LedState F5_release (Mackie::Button &);
-       Mackie::LedState F6_press (Mackie::Button &);
-       Mackie::LedState F6_release (Mackie::Button &);
-       Mackie::LedState F7_press (Mackie::Button &);
-       Mackie::LedState F7_release (Mackie::Button &);
-       Mackie::LedState F8_press (Mackie::Button &);
-       Mackie::LedState F8_release (Mackie::Button &);
+//     Mackie::LedState F1_press (Mackie::Button &);
+//     Mackie::LedState F1_release (Mackie::Button &);
+//     Mackie::LedState F2_press (Mackie::Button &);
+//     Mackie::LedState F2_release (Mackie::Button &);
+//     Mackie::LedState F3_press (Mackie::Button &);
+//     Mackie::LedState F3_release (Mackie::Button &);
+//     Mackie::LedState F4_press (Mackie::Button &);
+//     Mackie::LedState F4_release (Mackie::Button &);
+//     Mackie::LedState F5_press (Mackie::Button &);
+//     Mackie::LedState F5_release (Mackie::Button &);
+//     Mackie::LedState F6_press (Mackie::Button &);
+//     Mackie::LedState F6_release (Mackie::Button &);
+//     Mackie::LedState F7_press (Mackie::Button &);
+//     Mackie::LedState F7_release (Mackie::Button &);
+//     Mackie::LedState F8_press (Mackie::Button &);
+//     Mackie::LedState F8_release (Mackie::Button &);
        Mackie::LedState touch_press (Mackie::Button &);
        Mackie::LedState touch_release (Mackie::Button &);
        Mackie::LedState enter_press (Mackie::Button &);

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 49aa690f02746e9b11632e2a276aa0f84e6441a7..3bdf51c4b9e44840c44caaac72c97c61a66c6b02 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -617,50 +617,51 @@ MackieControlProtocol::bank_release (Button& b, uint32_t basic_bank_num)
        return on;
 }
 
+/*  F-KEYS are only used for actions that are bound from the control panel; no need to address them here
 LedState
 MackieControlProtocol::F1_press (Button &b)
 {
-       return off;
+       return on;
 }
 LedState
 MackieControlProtocol::F1_release (Button &b)
 {
-       return bank_release (b, 0);
+       return off;
 }
 LedState
 MackieControlProtocol::F2_press (Button &)
 {
-       return off;
+       return on;
 }
 LedState
 MackieControlProtocol::F2_release (Button &b)
 {
-       return bank_release (b, 1);
+       return off;
 }
 LedState
 MackieControlProtocol::F3_press (Button &)
 {
-       return off;
+       return on;
 }
 LedState
 MackieControlProtocol::F3_release (Button &b)
 {
-       return bank_release (b, 2);
+       return off;
 }
 LedState
 MackieControlProtocol::F4_press (Button &)
 {
-       return off;
+       return on;
 }
 LedState
 MackieControlProtocol::F4_release (Button &b)
 {
-       return bank_release (b, 3);
+       return off;
 }
 LedState
 MackieControlProtocol::F5_press (Button &)
 {
-       return off;
+       return on;
 }
 LedState
 MackieControlProtocol::F5_release (Button &)
@@ -670,7 +671,7 @@ MackieControlProtocol::F5_release (Button &)
 LedState
 MackieControlProtocol::F6_press (Button &)
 {
-       return off;
+       return on;
 }
 LedState
 MackieControlProtocol::F6_release (Button &)
@@ -680,7 +681,7 @@ MackieControlProtocol::F6_release (Button &)
 LedState
 MackieControlProtocol::F7_press (Button &)
 {
-       return off;
+       return on;
 }
 LedState
 MackieControlProtocol::F7_release (Button &)
@@ -690,14 +691,15 @@ MackieControlProtocol::F7_release (Button &)
 LedState
 MackieControlProtocol::F8_press (Button &)
 {
-       CloseDialog (); /* EMIT SIGNAL */
-       return off;
+       return on;
 }
 LedState
 MackieControlProtocol::F8_release (Button &)
 {
        return off;
 }
+*/
+
 
 /* UNIMPLEMENTED */