From 8713667ec1a6cc9ba56c07f763e5a422cc47fbef Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 15 Oct 2009 18:56:11 +0000 Subject: rework Stateful::set_state() patch to avoid default version argument git-svn-id: svn://localhost/ardour2/branches/3.0@5787 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 2 +- libs/surfaces/generic_midi/generic_midi_control_protocol.h | 2 +- libs/surfaces/generic_midi/midicontrollable.h | 2 +- libs/surfaces/mackie/mackie_control_protocol.h | 2 +- libs/surfaces/osc/osc.h | 2 +- libs/surfaces/osc/osc_controllable.h | 2 +- libs/surfaces/powermate/powermate.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'libs/surfaces') diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index b3cd5746a6..af82471a90 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -371,7 +371,7 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version) if (c) { MIDIControllable* mc = new MIDIControllable (*_port, *c); - if (mc->set_state (**niter) == 0) { + if (mc->set_state (**niter, version) == 0) { controllables.insert (mc); } diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h index 6a81eda021..6473a869ae 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 version = 3000); + int set_state (const XMLNode&, int version); private: MIDI::Port* _port; diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h index b2805744a3..f0b973f0f0 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 version = 3000); + int set_state (const XMLNode&, int version); 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.h b/libs/surfaces/mackie/mackie_control_protocol.h index 3d1dea1ed4..12aea1c0ae 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 version = 3000); + int set_state (const XMLNode&, int version); static bool probe(); diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index a814726b4e..d0bc509f17 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 version = 3000); + int set_state (const XMLNode&, int version); int set_active (bool yn); bool get_active () const; diff --git a/libs/surfaces/osc/osc_controllable.h b/libs/surfaces/osc/osc_controllable.h index b5021aa397..bb80874e5e 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 version = 3000); + int set_state (const XMLNode& node, int version); protected: boost::shared_ptr controllable; diff --git a/libs/surfaces/powermate/powermate.h b/libs/surfaces/powermate/powermate.h index d03fb1fce4..b8fd2b5789 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 version = 3000); + int set_state (const XMLNode&, int version); private: -- cgit v1.2.3