Merge branch 'master' into saveas

[ardour.git] / libs / surfaces / mackie / led.cc

diff --git a/libs/surfaces/mackie/led.cc b/libs/surfaces/mackie/led.cc
index 43628e92bf7e94bff5baa1d827f2a0396d73dc4d..6a090cdc749207848d2413f6901ceded2c982458 100644 (file)
--- a/libs/surfaces/mackie/led.cc
+++ b/libs/surfaces/mackie/led.cc
@@ -21,8 +21,15 @@
 #include "surface.h"
 #include "control_group.h"
 
+using namespace ArdourSurface;
 using namespace Mackie;
 
+const int Led::FaderTouch = 0x70;
+const int Led::Timecode = 0x71;
+const int Led::Beats = 0x72;
+const int Led::RudeSolo = 0x73;
+const int Led::RelayClick = 0x74;
+
 Control*
 Led::factory (Surface& surface, int id, const char* name, Group& group)
 {
@@ -36,21 +43,20 @@ Led::factory (Surface& surface, int id, const char* name, Group& group)
 MidiByteArray 
 Led::set_state (LedState new_state)
 {
-       if (new_state != state) {
-               return MidiByteArray();
-       }
-       
        state = new_state;
 
        MIDI::byte msg = 0;
 
        switch  (state.state()) {
        case LedState::on:                      
-               msg = 0x7f; break;
+               msg = 0x7f; 
+               break;
        case LedState::off:                     
-               msg = 0x00; break;
+               msg = 0x00; 
+               break;
        case LedState::flashing:        
-               msg = 0x01; break;
+               msg = 0x01; 
+               break;
        case LedState::none:                    
                return MidiByteArray ();
        }