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

47 files changed, 66 insertions, 67 deletions

diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 3cd1bf13dd..724b1095a1 100644
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -55,7 +55,7 @@ public:
 	void apply_gain_automation(bool yn) { _apply_gain_automation = yn; }
 
 	XMLNode& state (bool full);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	static void apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t target);
 	static void apply_simple_gain(BufferSet& bufs, nframes_t nframes, gain_t target);
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index 507b148d82..ae2176cbab 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -126,7 +126,7 @@ class AudioDiskstream : public Diskstream
 	/* stateful */
 
 	XMLNode& get_state(void);
-	int      set_state(const XMLNode& node, int version = 3000);
+	int      set_state(const XMLNode& node, int version);
 
 	void monitor_input (bool);
 
diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index 585d1a1e72..fc5b4255b3 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -55,7 +55,7 @@ class AudioTrack : public Track
 	boost::shared_ptr<Region> bounce (InterThreadInfo&);
 	boost::shared_ptr<Region> bounce_range (nframes_t start, nframes_t end, InterThreadInfo&, bool enable_processing);
 
-	int set_state(const XMLNode&, int version = 3000);
+	int set_state(const XMLNode&, int version);
 
   protected:
 	XMLNode& state (bool full);
diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 6b93ced905..95c7db4385 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -72,7 +72,7 @@ public:
 	int setup_peakfile ();
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	bool can_truncate_peaks() const { return !destructive(); }
 	bool can_be_analysed() const    { return _length > 0; }
diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 25595def8c..277fe5a8e1 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -50,7 +50,7 @@ class AudioPlaylist : public ARDOUR::Playlist
 
         nframes_t read (Sample *dst, Sample *mixdown, float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n=0);
 
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade;
 
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 5e9031c897..a8055575f9 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -107,7 +107,7 @@ class AudioRegion : public Region
 	virtual nframes_t read_raw_internal (Sample*, sframes_t, nframes_t, int channel) const;
 
 	XMLNode& state (bool);
-	int      set_state (const XMLNode&, int version = 3000);
+	int      set_state (const XMLNode&, int version);
 
 	static void set_default_fade (float steepness, nframes_t len);
 	bool fade_in_is_default () const;
@@ -219,7 +219,7 @@ class AudioRegion : public Region
 
 	AudioRegion (Session& s, nframes_t, nframes_t, std::string name);
 
-	int set_live_state (const XMLNode&, Change&, bool send);
+	int set_live_state (const XMLNode&, int version, Change&, bool send);
 };
 
 } /* namespace ARDOUR */
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index eebd1dd5d9..dd6076630d 100644
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -79,7 +79,7 @@ class AudioSource : virtual public Source,
 	mutable sigc::signal<void,nframes_t,nframes_t>  PeakRangeReady;
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	int rename_peakfile (Glib::ustring newpath);
 	void touch_peakfile ();
diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h
index 5f074385a3..69c8e38c95 100644
--- a/libs/ardour/ardour/automation_list.h
+++ b/libs/ardour/ardour/automation_list.h
@@ -80,7 +80,7 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL
 	bool touching() const { return _touching; }
 
 	XMLNode& get_state (); 
-	int set_state (const XMLNode &, int version = 3000);
+	int set_state (const XMLNode &, int version);
 	XMLNode& state (bool full);
 	XMLNode& serialize_events ();
 
diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h
index d1f059dc62..d2b1796b18 100644
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -70,7 +70,7 @@ struct ControlProtocolInfo {
 
 	void set_protocol_states (const XMLNode&);
 
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 	XMLNode& get_state (void);
 
   private:
diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index 8a7773c035..5d8e0235fb 100644
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -75,7 +75,7 @@ class Crossfade : public ARDOUR::AudioRegion
 	bool operator== (const ARDOUR::Crossfade&);
 
 	XMLNode& get_state (void);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	boost::shared_ptr<ARDOUR::AudioRegion> in() const { return _in; }
 	boost::shared_ptr<ARDOUR::AudioRegion> out() const { return _out; }
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index ef78c9bd45..beccab73ae 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -89,7 +89,7 @@ public:
 	static sigc::signal<void,nframes_t> CycleStart;
 
 	XMLNode& state (bool full);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	/* Panning */
 
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 5427dc644d..23ba6a713e 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -130,7 +130,7 @@ class Diskstream : public SessionObject, public boost::noncopyable
 
 	/* Stateful */
 	virtual XMLNode& get_state(void) = 0;
-	virtual int      set_state(const XMLNode&, int version = 3000) = 0;
+	virtual int      set_state(const XMLNode&, int version) = 0;
 	
 	virtual void monitor_input (bool) {}
 
diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h
index 5a9c2a9c56..ce34f1c0d4 100644
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -46,7 +46,7 @@ public:
 	bool                 is_embedded () const { return _is_embedded; }
 	uint16_t             channel()      const { return _channel; }
 
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	int set_source_name (const Glib::ustring& newname, bool destructive);
 
diff --git a/libs/ardour/ardour/internal_return.h b/libs/ardour/ardour/internal_return.h
index e896200c93..dfd37a4de5 100644
--- a/libs/ardour/ardour/internal_return.h
+++ b/libs/ardour/ardour/internal_return.h
@@ -38,7 +38,7 @@ class InternalReturn : public Return
 
 	XMLNode& state(bool full);
 	XMLNode& get_state(void);
-	int set_state(const XMLNode&, int version = 3000);
+	int set_state(const XMLNode&, int version);
 
 	void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
 	bool configure_io (ChanCount in, ChanCount out);
diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h
index d62be9eafa..3b069af194 100644
--- a/libs/ardour/ardour/internal_send.h
+++ b/libs/ardour/ardour/internal_send.h
@@ -38,7 +38,7 @@ class InternalSend : public Send
 
 	XMLNode& state(bool full);
 	XMLNode& get_state(void);
-	int set_state(const XMLNode& node, int version = 3000);
+	int set_state(const XMLNode& node, int version);
 	
 	void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
 	bool feeds (boost::shared_ptr<Route> other) const;
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 9a13ced942..5d64fae580 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -137,7 +137,7 @@ class IO : public SessionObject, public Latent
 
 	virtual XMLNode& state (bool full);
 	XMLNode& get_state (void);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 	int set_state_2X (const XMLNode&, int, bool);
 
 	static int  disable_connecting (void);
diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h
index fdb0429bca..0d564bb00c 100644
--- a/libs/ardour/ardour/io_processor.h
+++ b/libs/ardour/ardour/io_processor.h
@@ -72,7 +72,7 @@ class IOProcessor : public Processor
 	sigc::signal<void,IOProcessor*,uint32_t> AutomationChanged;
 
 	XMLNode& state (bool full_state);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 	
   protected:
 	boost::shared_ptr<IO> _input;
diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h
index b08f3e5afa..656c13afae 100644
--- a/libs/ardour/ardour/ladspa_plugin.h
+++ b/libs/ardour/ardour/ladspa_plugin.h
@@ -99,7 +99,7 @@ class LadspaPlugin : public ARDOUR::Plugin
 	bool parameter_is_toggled(uint32_t) const;
 
 	XMLNode& get_state();
-	int      set_state (const XMLNode&, int version = 3000);
+	int      set_state (const XMLNode&, int version);
 	bool     save_preset(std::string name);
 
 	bool has_editor() const { return false; }
@@ -133,7 +133,7 @@ class LadspaPlugin : public ARDOUR::Plugin
 	void init (void *mod, uint32_t index, nframes_t rate);
 	void run_in_place (nframes_t nsamples);
 	void latency_compute_run ();
-	int set_state_2X (const XMLNode&, int version = 3000);
+	int set_state_2X (const XMLNode&, int version);
 };
 
 class LadspaPluginInfo : public PluginInfo {
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index cbc0782a4a..b48db52d92 100644
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.h
@@ -71,7 +71,7 @@ class Location : public PBD::StatefulDestructible
 	}
 
 	Location (const Location& other);
-	Location (const XMLNode&, int version = 3000);
+	Location (const XMLNode&);
 	Location* operator= (const Location& other);
 
 	bool locked() const { return _locked; }
@@ -125,7 +125,7 @@ class Location : public PBD::StatefulDestructible
 	XMLNode& cd_info_node (const std::string &, const std::string &);
 
 	XMLNode& get_state (void);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
   private:
 	std::string   _name;
@@ -155,7 +155,7 @@ class Locations : public PBD::StatefulDestructible
 	void clear_ranges ();
 
 	XMLNode& get_state (void);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
         Location *get_location_by_id(PBD::ID);
 
 	Location* auto_loop_location () const;
diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index de42512cfe..f2773a3d6c 100644
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -115,7 +115,7 @@ class LV2Plugin : public ARDOUR::Plugin
 	static uint32_t midi_event_type() { return _midi_event_type; }
 
 	XMLNode& get_state();
-	int      set_state(const XMLNode& node);
+	int      set_state(const XMLNode& node, int version);
 	bool     save_preset(std::string uri);
 	bool     load_preset(const std::string uri);
 	virtual std::vector<Plugin::PresetRecord> get_presets();
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index aab752d591..e152989229 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -75,7 +75,7 @@ class MidiDiskstream : public Diskstream
 
 	/* stateful */
 	XMLNode& get_state(void);
-	int set_state(const XMLNode&, int version = 3000);
+	int set_state(const XMLNode&, int version);
 
 	void monitor_input (bool);
 
diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h
index a5b0e36b26..6c7e26119a 100644
--- a/libs/ardour/ardour/midi_model.h
+++ b/libs/ardour/ardour/midi_model.h
@@ -70,7 +70,7 @@ public:
 		void operator()();
 		void undo();
 		
-		int set_state (const XMLNode&, int version = 3000);
+		int set_state (const XMLNode&, int version);
 		XMLNode& get_state ();
 
 		void add(const boost::shared_ptr< Evoral::Note<TimeType> > note);
@@ -114,7 +114,7 @@ public:
 		void operator()();
 		void undo();
 		
-		int set_state (const XMLNode&, int version = 3000);
+		int set_state (const XMLNode&, int version);
 		XMLNode& get_state ();
 
 		void change (const boost::shared_ptr<Evoral::Note<TimeType> > note,
diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h
index dc315edb12..c83bf80a28 100644
--- a/libs/ardour/ardour/midi_playlist.h
+++ b/libs/ardour/ardour/midi_playlist.h
@@ -50,7 +50,7 @@ public:
 	nframes_t read (MidiRingBuffer<nframes_t>& buf,
 			nframes_t start, nframes_t cnt, uint32_t chan_n=0);
 
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	bool destroy_region (boost::shared_ptr<Region>);
 
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index ddb3109ff6..c796ee742b 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -68,7 +68,7 @@ class MidiRegion : public Region
 			NoteMode  mode = Sustained) const;
 
 	XMLNode& state (bool);
-	int      set_state (const XMLNode&, int version = 3000);
+	int      set_state (const XMLNode&, int version);
 
 	int separate_by_channel (ARDOUR::Session&, std::vector< boost::shared_ptr<Region> >&) const;
 
@@ -118,7 +118,7 @@ class MidiRegion : public Region
 
   protected:
 
-	int set_live_state (const XMLNode&, Change&, bool send);
+	int set_live_state (const XMLNode&, int version, Change&, bool send);
 };
 
 } /* namespace ARDOUR */
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 8a09aad6c8..bffcde5192 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -91,7 +91,7 @@ class MidiSource : virtual public Source
 	mutable sigc::signal<void,sframes_t,nframes_t> ViewDataRangeReady;
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	bool length_mutable() const { return true; }
 
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 9f19c6590c..c273395a74 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -59,7 +59,7 @@ public:
 	boost::shared_ptr<Region>  bounce_range (
 			nframes_t start, nframes_t end, InterThreadInfo&, bool enable_processing);
 
-	int set_state(const XMLNode&, int version = 3000);
+	int set_state(const XMLNode&, int version);
 
 	void midi_panic(void);
 	bool write_immediate_event(size_t size, const uint8_t* buf);
diff --git a/libs/ardour/ardour/mute_master.h b/libs/ardour/ardour/mute_master.h
index 39ad9ffd61..70015f3a35 100644
--- a/libs/ardour/ardour/mute_master.h
+++ b/libs/ardour/ardour/mute_master.h
@@ -65,7 +65,7 @@ class MuteMaster : public AutomationControl
 	sigc::signal<void> MutePointChanged;
 
 	XMLNode& get_state();
-	int set_state(const XMLNode&, int version = 3000);
+	int set_state(const XMLNode&, int version);
 
   private:
 	AutomationList* _automation;
diff --git a/libs/ardour/ardour/named_selection.h b/libs/ardour/ardour/named_selection.h
index 4911dd8c50..d41f104e1a 100644
--- a/libs/ardour/ardour/named_selection.h
+++ b/libs/ardour/ardour/named_selection.h
@@ -44,7 +44,7 @@ struct NamedSelection : public PBD::Stateful
 
     XMLNode& get_state (void);
 
-    int set_state (const XMLNode&, int version = 3000);
+    int set_state (const XMLNode&, int version);
 
     static sigc::signal<void,NamedSelection*> NamedSelectionCreated;
 };
diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index 6a435ec235..86cd486113 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -73,7 +73,7 @@ class StreamPanner : public sigc::trackable, public PBD::Stateful
 	sigc::signal<void> Changed;      /* for position */
 	sigc::signal<void> StateChanged; /* for mute */
 
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 	virtual XMLNode& state (bool full_state) = 0;
 
 	Panner & get_parent() { return parent; }
@@ -150,7 +150,7 @@ class EqualPowerStereoPanner : public BaseStereoPanner
 
 	XMLNode& state (bool full_state); 
 	XMLNode& get_state (void); 
-	int      set_state (const XMLNode&, int version = 3000);
+	int      set_state (const XMLNode&, int version);
 
   private:
 	void update ();
@@ -171,7 +171,7 @@ class Multi2dPanner : public StreamPanner
 
 	XMLNode& state (bool full_state);
 	XMLNode& get_state (void);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	/* old school automation loading */
 
@@ -228,7 +228,7 @@ public:
 
 	XMLNode& get_state (void);
 	XMLNode& state (bool full);
-	int      set_state (const XMLNode&, int version = 3000);
+	int      set_state (const XMLNode&, int version);
 
 	static bool equivalent (pan_t a, pan_t b) {
 		return fabsf (a - b) < 0.002; // about 1 degree of arc for a stereo panner
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 01bb12db8d..aa661b8588 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -124,7 +124,7 @@ class Playlist : public SessionObject,
 	void foreach_region (sigc::slot<void, boost::shared_ptr<Region> >);
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 	XMLNode& get_template ();
 
 	sigc::signal<void,bool> InUse;
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 82111a5a4d..ea8228f5fc 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -45,14 +45,14 @@ class PluginInsert : public Processor
 {
   public:
 	PluginInsert (Session&, boost::shared_ptr<Plugin>);
-	PluginInsert (Session&, const XMLNode&, int version = 3000);
+	PluginInsert (Session&, const XMLNode&);
 	~PluginInsert ();
 
 	static const std::string port_automation_node_name;
 
 	XMLNode& state(bool);
 	XMLNode& get_state(void);
-	int set_state(const XMLNode&, int version = 3000);
+	int set_state(const XMLNode&, int version);
 
 	void run (BufferSet& in, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
 	void silence (nframes_t nframes);
diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h
index 73dacf7d68..3283415e6d 100644
--- a/libs/ardour/ardour/port_insert.h
+++ b/libs/ardour/ardour/port_insert.h
@@ -44,12 +44,12 @@ class PortInsert : public IOProcessor
 {
   public:
 	PortInsert (Session&, boost::shared_ptr<MuteMaster> mm);
-	PortInsert (Session&, boost::shared_ptr<MuteMaster> mm, const XMLNode&, int version = 3000);
+	PortInsert (Session&, boost::shared_ptr<MuteMaster> mm, const XMLNode&);
 	~PortInsert ();
 
 	XMLNode& state(bool full);
 	XMLNode& get_state(void);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
 
diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index 1e78777edd..473bb97130 100644
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -91,7 +91,7 @@ class Processor : public SessionObject, public AutomatableControls, public Laten
 
 	virtual XMLNode& state (bool full);
 	XMLNode& get_state (void);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 	
 	void *get_gui () const { return _gui; }
 	void  set_gui (void *p) { _gui = p; }
diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h
index d0dc042bb1..555c925a01 100644
--- a/libs/ardour/ardour/rc_configuration.h
+++ b/libs/ardour/ardour/rc_configuration.h
@@ -37,7 +37,7 @@ class RCConfiguration : public Configuration
 	RCConfiguration();
 
 	void map_parameters (sigc::slot<void, std::string>);
-	int set_state (XMLNode const &, int version = 3000);
+	int set_state (XMLNode const &, int version);
 	XMLNode& get_state ();
 	XMLNode& get_variables ();
 	void set_variables (XMLNode const &);
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index d341489249..0f1f10eff8 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -241,8 +241,8 @@ class Region
 
 	XMLNode&         get_state ();
 	virtual XMLNode& state (bool);
-	virtual int      set_state (const XMLNode&, int version = 3000);
-	virtual int      set_live_state (const XMLNode&, Change&, bool send);
+	virtual int      set_state (const XMLNode&, int version);
+	virtual int      set_live_state (const XMLNode&, int version, Change&, bool send);
 
 	virtual boost::shared_ptr<Region> get_parent() const;
 
diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h
index 3232e93295..b3212fe4a0 100644
--- a/libs/ardour/ardour/return.h
+++ b/libs/ardour/ardour/return.h
@@ -54,7 +54,7 @@ public:
 
 	XMLNode& state(bool full);
 	XMLNode& get_state(void);
-	int      set_state(const XMLNode&, int version = 3000);
+	int      set_state(const XMLNode&, int version);
 
 	uint32_t pans_required() const { return _configured_input.n_audio(); }
 
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index ac3c6f89f3..51e4d99335 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -66,9 +66,8 @@ class Route : public SessionObject, public AutomatableControls
 		ControlOut = 0x4
 	};
 
-	Route (Session&, std::string name, Flag flags = Flag(0),
-	       DataType default_type = DataType::AUDIO);
-	Route (Session&, const XMLNode&, int, DataType default_type = DataType::AUDIO);
+	Route (Session&, std::string name, Flag flags = Flag(0), DataType default_type = DataType::AUDIO);
+	Route (Session&, const XMLNode&, DataType default_type = DataType::AUDIO);
 	virtual ~Route();
 
 	boost::shared_ptr<IO> input() const { return _input; }
@@ -251,7 +250,7 @@ class Route : public SessionObject, public AutomatableControls
 	/* stateful */
 
 	XMLNode& get_state();
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 	virtual XMLNode& get_template();
 
 	XMLNode& get_processor_state ();
diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index 124f3c9b3f..0f71093377 100644
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -131,7 +131,7 @@ public:
 
 	XMLNode& get_state ();
 	
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 	
 private:
 	Session& _session;
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index 13b7adbbf2..f9f13ee309 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -53,7 +53,7 @@ class Send : public Delivery
 
 	XMLNode& state(bool full);
 	XMLNode& get_state(void);
-	int set_state(const XMLNode&, int version = 3000);
+	int set_state(const XMLNode&, int version);
 
 	uint32_t pans_required() const { return _configured_input.n_audio(); }
 
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index c5b793730c..cc94d3878c 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -468,7 +468,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 	static std::vector<std::string*>* possible_states (std::string path);
 
 	XMLNode& get_state();
-	int      set_state(const XMLNode& node, int version = 3000); // not idempotent
+	int      set_state(const XMLNode& node, int version); // not idempotent
 	XMLNode& get_template();
 
 	/// The instant xml file is written to the session directory
@@ -849,7 +849,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 	public:
 		GlobalRouteStateCommand (Session&, void*);
 		GlobalRouteStateCommand (Session&, const XMLNode& node);
-		int set_state (const XMLNode&, int version = 3000);
+		int set_state (const XMLNode&, int version);
 		XMLNode& get_state ();
 
 	protected:
@@ -899,7 +899,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 		void operator()();
 		void undo();
 		XMLNode &get_state();
-		int set_state (const XMLNode&, int version = 3000);
+		int set_state (const XMLNode&, int version);
 		void mark();
 
 	protected:
@@ -1170,8 +1170,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
 	std::string _current_snapshot_name;
 
-	XMLTree* state_tree;
-	bool     state_was_pending;
+	XMLTree*         state_tree;
+	bool             state_was_pending;
 	StateOfTheState _state_of_the_state;
 
 	void     auto_save();
diff --git a/libs/ardour/ardour/session_configuration.h b/libs/ardour/ardour/session_configuration.h
index 20e14f37d5..20df86ca4d 100644
--- a/libs/ardour/ardour/session_configuration.h
+++ b/libs/ardour/ardour/session_configuration.h
@@ -30,7 +30,7 @@ public:
 	SessionConfiguration ();
 
 	void map_parameters (sigc::slot<void, std::string>);
-	int set_state (XMLNode const &, int version = 3000);
+	int set_state (XMLNode const &, int version);
 	XMLNode& get_state ();
 	XMLNode& get_variables ();
 	void set_variables (XMLNode const &);
diff --git a/libs/ardour/ardour/session_metadata.h b/libs/ardour/ardour/session_metadata.h
index 7813788e55..481e21c338 100644
--- a/libs/ardour/ardour/session_metadata.h
+++ b/libs/ardour/ardour/session_metadata.h
@@ -107,7 +107,7 @@ class SessionMetadata : public PBD::StatefulDestructible
 
 	/*** Serialization ***/
 	XMLNode & get_state ();
-	int set_state (const XMLNode &, int version = 3000);
+	int set_state (const XMLNode &, int version);
 
   private:
 
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 3c6364532a..fbaa049d8a 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -58,7 +58,7 @@ public:
 	void mark_streaming_write_completed ();
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	void load_model (bool lock=true, bool force_reload=false);
 	void destroy_model ();
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index c34c5a9158..1ffca509fd 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -76,7 +76,7 @@ class Source : public SessionObject, public boost::noncopyable
 	virtual void session_saved() {}
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 	
 	bool         destructive() const       { return (_flags & Destructive); }
 	bool         writable () const         { return (_flags & Writable); }
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index 742919c77a..658330cf82 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -212,7 +212,7 @@ class TempoMap : public PBD::StatefulDestructible
 	void set_length (nframes_t frames);
 
 	XMLNode& get_state (void);
-	int set_state (const XMLNode&, int version = 3000);
+	int set_state (const XMLNode&, int version);
 
 	void dump (std::ostream&) const;
 	void clear ();
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 74cbe399df..02cab70a84 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -82,7 +82,7 @@ class Track : public Route
 
 	XMLNode&    get_state();
 	XMLNode&    get_template();
-	virtual int set_state (const XMLNode&, int version = 3000) = 0;
+	virtual int set_state (const XMLNode&, int version) = 0;
 	static void zero_diskstream_id_in_xml (XMLNode&);
 
 	boost::shared_ptr<PBD::Controllable> rec_enable_control() { return _rec_enable_control; }
@@ -96,7 +96,7 @@ class Track : public Route
 	sigc::signal<void> FreezeChange;
 
   protected:
-	Track (Session& sess, const XMLNode& node, int, DataType default_type = DataType::AUDIO);
+	Track (Session& sess, const XMLNode& node, DataType default_type = DataType::AUDIO);
 
 	virtual XMLNode& state (bool full) = 0;
 
diff --git a/libs/ardour/ardour/user_bundle.h b/libs/ardour/ardour/user_bundle.h
index f590ec1ebe..c124e2e722 100644
--- a/libs/ardour/ardour/user_bundle.h
+++ b/libs/ardour/ardour/user_bundle.h
@@ -38,7 +38,7 @@ class UserBundle : public Bundle, public PBD::Stateful {
 	XMLNode& get_state ();
 
   private:
-	int set_state (XMLNode const &, int version = 3000);
+	int set_state (XMLNode const &, int version);
 };
 
 }