diff options
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/audio_track.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_track.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/route.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/track.h | 2 | ||||
| -rw-r--r-- | libs/ardour/audio_track.cc | 10 | ||||
| -rw-r--r-- | libs/ardour/midi_track.cc | 10 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/track.cc | 10 |
8 files changed, 18 insertions, 24 deletions
diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index c39c7f5640..01cbb633ae 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -67,7 +67,7 @@ class AudioTrack : public Track boost::shared_ptr<AudioDiskstream> audio_diskstream () const; XMLNode& state (bool full); - int _set_state (const XMLNode&, int, bool call_base); + int _set_state (const XMLNode&, int); private: int deprecated_use_diskstream_connections (); diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index a2cc2e7d9d..2337cdcbed 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -113,7 +113,7 @@ public: protected: XMLNode& state (bool full); - int _set_state (const XMLNode&, int, bool call_base); + 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 e6e6a7e087..8dc3ea1b75 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -491,7 +491,7 @@ 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, bool call_base); + virtual int _set_state (const XMLNode&, int); boost::shared_ptr<Amp> _amp; boost::shared_ptr<PeakMeter> _meter; diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index dd8a17f8ce..8f94625818 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -162,7 +162,7 @@ class Track : public Route, public PublicDiskstream protected: XMLNode& state (bool full); - int _set_state (const XMLNode&, int version, bool); + 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 a4049b28a7..deefd45e89 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -201,20 +201,18 @@ AudioTrack::deprecated_use_diskstream_connections () int AudioTrack::set_state (const XMLNode& node, int version) { - return _set_state (node, version, true); + return _set_state (node, version); } int -AudioTrack::_set_state (const XMLNode& node, int version, bool call_base) +AudioTrack::_set_state (const XMLNode& node, int version) { const XMLProperty *prop; XMLNodeConstIterator iter; XMLNode *child; - if (call_base) { - if (Track::_set_state (node, version, call_base)) { - return -1; - } + if (Track::_set_state (node, version)) { + return -1; } if ((prop = node.property (X_("mode"))) != 0) { diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 9145cad7f3..6821d9fec3 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -136,19 +136,17 @@ MidiTrack::midi_diskstream() const int MidiTrack::set_state (const XMLNode& node, int version) { - return _set_state (node, version, true); + return _set_state (node, version); } int -MidiTrack::_set_state (const XMLNode& node, int version, bool call_base) +MidiTrack::_set_state (const XMLNode& node, int version) { const XMLProperty *prop; XMLNodeConstIterator iter; - if (call_base) { - if (Track::_set_state (node, version, call_base)) { - return -1; - } + if (Track::_set_state (node, version)) { + return -1; } // No destructive MIDI tracks (yet?) diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index dcb85c9156..a7fb05ec15 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -1884,11 +1884,11 @@ Route::state(bool full_state) int Route::set_state (const XMLNode& node, int version) { - return _set_state (node, version, true); + return _set_state (node, version); } int -Route::_set_state (const XMLNode& node, int version, bool /*call_base*/) +Route::_set_state (const XMLNode& node, int version) { if (version < 3000) { return _set_state_2X (node, version); diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index a91d31fe52..493dac73f9 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -82,16 +82,14 @@ Track::state (bool full) int Track::set_state (const XMLNode& node, int version) { - return _set_state (node, version, true); + return _set_state (node, version); } int -Track::_set_state (const XMLNode& node, int version, bool call_base) +Track::_set_state (const XMLNode& node, int version) { - if (call_base) { - if (Route::_set_state (node, version, call_base)) { - return -1; - } + if (Route::_set_state (node, version)) { + return -1; } const XMLProperty* prop; |