X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Ffaderport8%2Ffaderport8.cc;h=5e5cf498f739ed0d2b0037f1f3a9157231d9e38e;hb=7b1a875f9c736b419285318147b3dc6b9c0a0e00;hp=70fed25766028c9d70070ea39a8dadec47967175;hpb=948834bb1e2ffd1024eba3d3acb84e560d4f5e33;p=ardour.git

diff --git a/libs/surfaces/faderport8/faderport8.cc b/libs/surfaces/faderport8/faderport8.cc
index 70fed25766..5e5cf498f7 100644
--- a/libs/surfaces/faderport8/faderport8.cc
+++ b/libs/surfaces/faderport8/faderport8.cc
@@ -1,20 +1,21 @@
 /*
- * Copyright (C) 2017 Robin Gareus <robin@gareus.org>
- * Copyright (C) 2015 Paul Davis
+ * Copyright (C) 2017-2018 Ben Loftis <ben@harrisonconsoles.com>
+ * Copyright (C) 2017-2018 Robin Gareus <robin@gareus.org>
+ * Copyright (C) 2017 Paul Davis <paul@linuxaudiosystems.com>
  *
- * 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.
  */
 
 #include <cstdlib>
@@ -757,9 +758,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()) {
@@ -956,7 +959,7 @@ FaderPort8::filter_stripables (StripableList& strips) const
 			break;
 		default:
 			assert (0);
-			// fall through
+			/* fallthrough */
 		case MixAll:
 			allow_master = true;
 			flt = &flt_all;
@@ -1302,6 +1305,7 @@ FaderPort8::build_well_known_processor_ctrls (boost::shared_ptr<Stripable> s, bo
 	} else {
 		PUSH_BACK_NON_NULL ("Comp In", s->comp_enable_controllable ());
 		PUSH_BACK_NON_NULL ("Threshold", s->comp_threshold_controllable ());
+		PUSH_BACK_NON_NULL ("Makeup", s->comp_makeup_controllable ());
 		PUSH_BACK_NON_NULL ("Speed", s->comp_speed_controllable ());
 		PUSH_BACK_NON_NULL ("Mode", s->comp_mode_controllable ());
 	}