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

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

diff --git a/libs/surfaces/faderport8/fp8_strip.h b/libs/surfaces/faderport8/fp8_strip.h
index c301dad7ed4df747bef532567009f513fc4f27f1..fc16d0f417010325c502210c1aa3e4cf3dfb47a0 100644 (file)
--- a/libs/surfaces/faderport8/fp8_strip.h
+++ b/libs/surfaces/faderport8/fp8_strip.h
@@ -28,7 +28,13 @@
 #include "fp8_base.h"
 #include "fp8_button.h"
 
-#define N_STRIPS 8
+#ifdef FADERPORT16
+# define N_STRIPS 16
+#elif defined FADERPORT2
+# define N_STRIPS 1
+#else
+# define N_STRIPS 8
+#endif
 
 namespace ARDOUR {
        class Stripable;
@@ -37,7 +43,7 @@ namespace ARDOUR {
        class ReadOnlyControl;
 }
 
-namespace ArdourSurface {
+namespace ArdourSurface { namespace FP_NAMESPACE {
 
 class FP8Strip
 {
@@ -64,6 +70,14 @@ public:
        FP8ButtonInterface& recarm_button () { return *_selrec.button_shift(); }
        FP8ButtonInterface& select_button () { return *_selrec.button(); }
 
+       void set_select_button_color (uint32_t color) {
+               if ((color & 0xffffff00) == 0) {
+                       select_button ().set_color (0xffffffff);
+               } else {
+                       select_button ().set_color (color);
+               }
+       }
+
        bool midi_touch (bool t);
        bool midi_fader (float val);
 
@@ -185,5 +199,5 @@ private:
        std::string _last_line[4];
 };
 
-} /* namespace */
+} } /* namespace */
 #endif /* _ardour_surfaces_fp8strip_h_ */