diff options
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/audio_track.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_track.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/route.h | 6 | ||||
-rw-r--r-- | libs/ardour/ardour/track.h | 3 | ||||
-rw-r--r-- | libs/ardour/audio_track.cc | 8 | ||||
-rw-r--r-- | libs/ardour/midi_track.cc | 8 | ||||
-rw-r--r-- | libs/ardour/route.cc | 10 | ||||
-rw-r--r-- | libs/ardour/track.cc | 8 |
8 files changed, 10 insertions, 40 deletions
diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index 978a346d11..f52148bebc 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -57,7 +57,7 @@ class AudioTrack : public Track boost::shared_ptr<Region> bounce (InterThreadInfo&); boost::shared_ptr<Region> bounce_range (framepos_t start, framepos_t end, InterThreadInfo&, bool enable_processing); - int set_state(const XMLNode&, int version); + int set_state (const XMLNode&, int version); boost::shared_ptr<AudioFileSource> write_source (uint32_t n = 0); @@ -67,8 +67,6 @@ class AudioTrack : public Track boost::shared_ptr<AudioDiskstream> audio_diskstream () const; XMLNode& state (bool full); - int _set_state (const XMLNode&, int); - private: boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &); diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index a70fc4604d..0df9f538f3 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -64,7 +64,7 @@ public: framepos_t start, framepos_t end, InterThreadInfo&, bool enable_processing ); - int set_state(const XMLNode&, int version); + int set_state (const XMLNode&, int version); void midi_panic(void); bool write_immediate_event(size_t size, const uint8_t* buf); @@ -114,7 +114,6 @@ public: protected: XMLNode& state (bool full); - int _set_state (const XMLNode&, int); bool should_monitor () const; bool send_silence () const; diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 7f485c18c3..54904bf016 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -288,7 +288,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, /* stateful */ XMLNode& get_state(); - int set_state (const XMLNode&, int version); + virtual int set_state (const XMLNode&, int version); virtual XMLNode& get_template(); XMLNode& get_processor_state (); @@ -493,13 +493,11 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, virtual bool should_monitor () const; virtual void maybe_declick (BufferSet&, framecnt_t, int); - virtual int _set_state (const XMLNode&, int); - boost::shared_ptr<Amp> _amp; boost::shared_ptr<PeakMeter> _meter; private: - int _set_state_2X (const XMLNode&, int); + int set_state_2X (const XMLNode&, int); void set_processor_state_2X (XMLNodeList const &, int); static uint32_t order_key_cnt; diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index e3ee892986..52120d1627 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -90,7 +90,7 @@ class Track : public Route, public PublicDiskstream XMLNode& get_state(); XMLNode& get_template(); - int set_state (const XMLNode&, int version); + virtual int set_state (const XMLNode&, int version); static void zero_diskstream_id_in_xml (XMLNode&); boost::shared_ptr<PBD::Controllable> rec_enable_control() { return _rec_enable_control; } @@ -162,7 +162,6 @@ class Track : public Route, public PublicDiskstream protected: XMLNode& state (bool full); - int _set_state (const XMLNode&, int version); boost::shared_ptr<Diskstream> _diskstream; MeterPoint _saved_meter_point; diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 1dc1ba3a6a..4f4cdcad36 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -201,15 +201,9 @@ AudioTrack::deprecated_use_diskstream_connections () int AudioTrack::set_state (const XMLNode& node, int version) { - return _set_state (node, version); -} - -int -AudioTrack::_set_state (const XMLNode& node, int version) -{ const XMLProperty *prop; - if (Track::_set_state (node, version)) { + if (Track::set_state (node, version)) { return -1; } diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 3253485412..8a50e88fa5 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -136,15 +136,9 @@ MidiTrack::midi_diskstream() const int MidiTrack::set_state (const XMLNode& node, int version) { - return _set_state (node, version); -} - -int -MidiTrack::_set_state (const XMLNode& node, int version) -{ const XMLProperty *prop; - if (Track::_set_state (node, version)) { + if (Track::set_state (node, version)) { return -1; } diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 8aebaf2664..57793098d8 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -1848,14 +1848,8 @@ Route::state(bool full_state) int Route::set_state (const XMLNode& node, int version) { - return _set_state (node, version); -} - -int -Route::_set_state (const XMLNode& node, int version) -{ if (version < 3000) { - return _set_state_2X (node, version); + return set_state_2X (node, version); } XMLNodeList nlist; @@ -2055,7 +2049,7 @@ Route::_set_state (const XMLNode& node, int version) } int -Route::_set_state_2X (const XMLNode& node, int version) +Route::set_state_2X (const XMLNode& node, int version) { XMLNodeList nlist; XMLNodeConstIterator niter; diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index c140baaed6..38230f0677 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -85,13 +85,7 @@ Track::state (bool full) int Track::set_state (const XMLNode& node, int version) { - return _set_state (node, version); -} - -int -Track::_set_state (const XMLNode& node, int version) -{ - if (Route::_set_state (node, version)) { + if (Route::set_state (node, version)) { return -1; } |