remove unused member

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

diff --git a/libs/surfaces/faderport8/fp8_base.h b/libs/surfaces/faderport8/fp8_base.h
index 9dc658c290be5e44436e70cc69fbdd4fb16f5d16..224a58b056fd06a06768d778bbf592ebcfeac973 100644 (file)
--- a/libs/surfaces/faderport8/fp8_base.h
+++ b/libs/surfaces/faderport8/fp8_base.h
@@ -1,19 +1,19 @@
 /*
  * Copyright (C) 2017 Robin Gareus <robin@gareus.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _ardour_surfaces_fp8base_h_
@@ -24,7 +24,15 @@
 
 #include "pbd/signals.h"
 
-namespace ArdourSurface {
+#ifdef FADERPORT16
+# define FP_NAMESPACE FP16
+#elif defined FADERPORT2
+# define FP_NAMESPACE FP2
+#else
+# define FP_NAMESPACE FP8
+#endif
+
+namespace ArdourSurface { namespace FP_NAMESPACE {
 
 /* conveniece wrappers depending on "FP8Base& _base" */
 #define fp8_loop dynamic_cast<BaseUI*>(&_base)->main_loop
@@ -48,7 +56,12 @@ public:
 
        virtual size_t tx_midi (std::vector<uint8_t> const&) const = 0;
        virtual std::string const& timecode () const = 0;
+       virtual std::string const& musical_time () const = 0;
        virtual bool shift_mod () const = 0;
+       virtual bool show_meters () const = 0;
+       virtual bool show_panner () const = 0;
+       virtual bool twolinetext () const = 0;
+       virtual uint32_t clock_mode () const = 0;
 
        size_t tx_midi2 (uint8_t sb, uint8_t d1) const
        {
@@ -91,7 +104,7 @@ public:
                 std::vector<uint8_t> d;
                 sysexhdr (d);
                 d.push_back (0x12);
-                d.push_back (id & 0x07);
+                d.push_back (id & 0x0f);
                 d.push_back (line & 0x03);
                 d.push_back (align & 0x07);
 
@@ -122,7 +135,11 @@ private:
                d.push_back (0x00);
                d.push_back (0x01);
                d.push_back (0x06);
+#ifdef FADERPORT16
+               d.push_back (0x16);
+#else
                d.push_back (0x02);
+#endif
        }
 };
 
@@ -142,7 +159,8 @@ namespace FP8Types {
                NavBank,
                NavMaster,
                NavSection,
-               NavMarker
+               NavMarker,
+               NavPan /* FP2 only */
        };
 
        enum MixMode {
@@ -156,9 +174,10 @@ namespace FP8Types {
                MixOutputs,
                MixFX,
                MixUser,
+               MixModeMax = MixUser
        };
 
 };
 
-} /* namespace */
+} } /* namespace */
 #endif /* _ardour_surfaces_fp8base_h_ */