12 files changed, 12 insertions, 12 deletions
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index a4987ee9d2..b3cd5746a6 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -323,7 +323,7 @@ GenericMidiControlProtocol::get_state ()
 }
 
 int
-GenericMidiControlProtocol::set_state (const XMLNode& node)
+GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
 {
 	XMLNodeList nlist;
 	XMLNodeConstIterator niter;
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
index dfff8810d1..6a81eda021 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
@@ -36,7 +36,7 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
 	bool get_feedback () const;
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&);
+	int set_state (const XMLNode&, int version = 3000);
 
   private:
 	MIDI::Port* _port;
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
index 9d80915ef6..8275d0849c 100644
--- a/libs/surfaces/generic_midi/midicontrollable.cc
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -361,7 +361,7 @@ MIDIControllable::write_feedback (MIDI::byte* buf, int32_t& bufsize, bool /*forc
 }
 
 int 
-MIDIControllable::set_state (const XMLNode& node)
+MIDIControllable::set_state (const XMLNode& node, int version)
 {
 	const XMLProperty* prop;
 	int xx;
diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h
index 9fe9dcd2ac..b2805744a3 100644
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -64,7 +64,7 @@ class MIDIControllable : public PBD::Stateful
 	std::string control_description() const { return _control_description; }
 
 	XMLNode& get_state (void);
-	int set_state (const XMLNode&);
+	int set_state (const XMLNode&, int version = 3000);
 
 	void bind_midi (MIDI::channel_t, MIDI::eventType, MIDI::byte);
 	MIDI::channel_t get_control_channel () { return control_channel; }
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 7c7fbd9ff5..5fef10fac4 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -806,7 +806,7 @@ XMLNode & MackieControlProtocol::get_state()
 	return *node;
 }
 
-int MackieControlProtocol::set_state( const XMLNode & node )
+int MackieControlProtocol::set_state (const XMLNode & node, int version)
 {
 #ifdef DEBUG
 	cout << "MackieControlProtocol::set_state: active " << _active << endl;
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 7d8a6f2fd0..3d1dea1ed4 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -78,7 +78,7 @@ class MackieControlProtocol
 	int set_active (bool yn);
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&);
+	int set_state (const XMLNode&, int version = 3000);
   
 	static bool probe();
 	
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index e26e0f7b77..9a6c19225b 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -864,7 +864,7 @@ OSC::get_state ()
 }
 		
 int 
-OSC::set_state (const XMLNode&)
+OSC::set_state (const XMLNode&, int /*version*/)
 {
 	return 0;
 }
diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index 2b6df6a80c..a814726b4e 100644
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -49,7 +49,7 @@ class OSC : public ARDOUR::ControlProtocol
 	virtual ~OSC();
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&);
+	int set_state (const XMLNode&, int version = 3000);
 
 	int set_active (bool yn);
 	bool get_active () const;
diff --git a/libs/surfaces/osc/osc_controllable.cc b/libs/surfaces/osc/osc_controllable.cc
index 3d3fefcac1..ed805466b0 100644
--- a/libs/surfaces/osc/osc_controllable.cc
+++ b/libs/surfaces/osc/osc_controllable.cc
@@ -51,7 +51,7 @@ OSCControllable::get_state ()
 }
 
 int
-OSCControllable::set_state (const XMLNode& /*node*/)
+OSCControllable::set_state (const XMLNode& /*node*/, int /*version*/)
 {
 	return 0;
 }
diff --git a/libs/surfaces/osc/osc_controllable.h b/libs/surfaces/osc/osc_controllable.h
index 4b10dbc39e..b5021aa397 100644
--- a/libs/surfaces/osc/osc_controllable.h
+++ b/libs/surfaces/osc/osc_controllable.h
@@ -44,7 +44,7 @@ class OSCControllable : public PBD::Stateful
 	lo_address address() const { return addr; }
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode& node);
+	int set_state (const XMLNode& node, int version = 3000);
 
   protected:
 	boost::shared_ptr<PBD::Controllable> controllable;
diff --git a/libs/surfaces/powermate/powermate.cc b/libs/surfaces/powermate/powermate.cc
index daee40cd44..a32c4696ae 100644
--- a/libs/surfaces/powermate/powermate.cc
+++ b/libs/surfaces/powermate/powermate.cc
@@ -154,7 +154,7 @@ PowermateControlProtocol::get_state ()
 }
 
 int
-PowermateControlProtocol::set_state (const XMLNode& /*node*/)
+PowermateControlProtocol::set_state (const XMLNode& /*node*/, int /*version*/)
 {
 	return 0;
 }
diff --git a/libs/surfaces/powermate/powermate.h b/libs/surfaces/powermate/powermate.h
index 6b0a2fbbc3..d03fb1fce4 100644
--- a/libs/surfaces/powermate/powermate.h
+++ b/libs/surfaces/powermate/powermate.h
@@ -16,7 +16,7 @@ class PowermateControlProtocol : public ARDOUR::ControlProtocol
 	static bool probe ();
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&);
+	int set_state (const XMLNode&, int version = 3000);
 
   private: