ActionManager::get_all_actions() no longer includes <Actions> in the paths it returns...

[ardour.git] / libs / surfaces / faderport8 / fp8_strip.cc

diff --git a/libs/surfaces/faderport8/fp8_strip.cc b/libs/surfaces/faderport8/fp8_strip.cc
index 9f875a9443cb136658e65ac715da45a3e278ee68..080b774c098e9025b9b0fbfc5d60b1b8f946bb42 100644 (file)
--- a/libs/surfaces/faderport8/fp8_strip.cc
+++ b/libs/surfaces/faderport8/fp8_strip.cc
@@ -60,7 +60,14 @@ FP8Strip::midi_ctrl_id (CtrlElement type, uint8_t id)
                id -= 8;
                switch (type) {
                        case BtnSolo:
-                               return 0x50 + id;
+                               switch (id) {
+                                       case 3:
+                                               return 0x58;
+                                       case 6:
+                                               return 0x59;
+                                       default:
+                                               return 0x50 + id;
+                               }
                        case BtnMute:
                                return 0x78 + id;
                        case BtnSelect:
@@ -321,7 +328,8 @@ FP8Strip::set_stripable (boost::shared_ptr<Stripable> s, bool panmode)
 
        set_select_controllable (boost::shared_ptr<AutomationControl>());
        select_button ().set_active (s->is_selected ());
-       select_button ().set_color (s->presentation_info ().color());
+
+       set_select_button_color (s->presentation_info ().color());
        //select_button ().set_blinking (false);
 
        _stripable_name = s->name ();
@@ -725,8 +733,10 @@ void
 FP8Strip::periodic ()
 {
        periodic_update_fader ();
+#ifndef FADERPORT2
        periodic_update_meter ();
        if (_displaymode != PluginSelect && _displaymode != PluginParam) {
                periodic_update_timecode (_base.clock_mode ());
        }
+#endif
 }