Tweak UI for Faderport2/2018

4 files changed, 18 insertions, 0 deletions

diff --git a/libs/surfaces/faderport8/faderport8.cc b/libs/surfaces/faderport8/faderport8.cc
index 70fed25766..e1f57c3eb2 100644
--- a/libs/surfaces/faderport8/faderport8.cc
+++ b/libs/surfaces/faderport8/faderport8.cc
@@ -757,9 +757,11 @@ FaderPort8::get_state ()
 	child->add_child_nocopy (boost::shared_ptr<ARDOUR::Port>(_output_port)->get_state());
 	node.add_child_nocopy (*child);
 
+#ifndef FADERPORT2
 	node.set_property (X_("clock-mode"), _clock_mode);
 	node.set_property (X_("scribble-mode"), _scribble_mode);
 	node.set_property (X_("two-line-text"), _two_line_text);
+#endif
 
 	for (UserActionMap::const_iterator i = _user_action_map.begin (); i != _user_action_map.end (); ++i) {
 		if (i->second.empty()) {
diff --git a/libs/surfaces/faderport8/fp8_controls.cc b/libs/surfaces/faderport8/fp8_controls.cc
index b0727c84a8..4946411d12 100644
--- a/libs/surfaces/faderport8/fp8_controls.cc
+++ b/libs/surfaces/faderport8/fp8_controls.cc
@@ -213,6 +213,13 @@ FP8Controls::FP8Controls (FP8Base& b)
 	_user_enum_to_str[ID]  = #ID; \
 	_user_buttons[ID]      = NAME;
 
+#ifdef FADERPORT2
+	REGISTER_ENUM (BtnF1        , "F1");
+	REGISTER_ENUM (BtnF2        , "F2");
+	REGISTER_ENUM (BtnF3        , "F3");
+	REGISTER_ENUM (BtnF4        , "F4");
+	REGISTER_ENUM (BtnFootswitch, "Footswitch");
+#else
 	REGISTER_ENUM (BtnFootswitch, "Footswitch");
 	REGISTER_ENUM (BtnUser1     , "User 1");
 	REGISTER_ENUM (BtnUser2     , "User 2");
@@ -225,6 +232,8 @@ FP8Controls::FP8Controls (FP8Base& b)
 	REGISTER_ENUM (BtnF6        , "F6");
 	REGISTER_ENUM (BtnF7        , "F7");
 	REGISTER_ENUM (BtnF8        , "F8");
+#endif
+
 #undef REGISTER_ENUM
 }
 
diff --git a/libs/surfaces/faderport8/fp8_controls.h b/libs/surfaces/faderport8/fp8_controls.h
index 548d07191c..030a8f20cc 100644
--- a/libs/surfaces/faderport8/fp8_controls.h
+++ b/libs/surfaces/faderport8/fp8_controls.h
@@ -56,7 +56,9 @@ public:
 		BtnUser2,
 		BtnUser3,
 
+#ifndef FADERPORT2
 		BtnFootswitch,
+#endif
 
 		// Pan/Param encoder press
 		BtnParam,
@@ -77,6 +79,9 @@ public:
 
 		BtnF1, BtnF2, BtnF3, BtnF4,
 		BtnF5, BtnF6, BtnF7, BtnF8,
+#ifdef FADERPORT2
+		BtnFootswitch,
+#endif
 
 		// FaderMode
 		BtnTrack,
diff --git a/libs/surfaces/faderport8/gui.cc b/libs/surfaces/faderport8/gui.cc
index 8d4d2f0450..fb12c00eb6 100644
--- a/libs/surfaces/faderport8/gui.cc
+++ b/libs/surfaces/faderport8/gui.cc
@@ -179,6 +179,7 @@ FP8GUI::FP8GUI (FaderPort8& p)
 
 	row += 4;
 
+#ifndef FADERPORT2
 	hsep = manage(new Gtk::HSeparator);
 	table.attach (*hsep, 0, 8, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 6);
 	row++;
@@ -200,6 +201,7 @@ FP8GUI::FP8GUI (FaderPort8& p)
 
 	table.attach (auto_pluginui_cb, 4, 8, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0);
 	row++;
+#endif
 
 	/* update the port connection combos */
 	update_port_combos ();