smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 13:46:30 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused call_base parameter from Route::_set_state.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10302 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-10-24 22:53:09 +00:00
parent ea01b6024d
commit 24056f055f
8 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/audio_track.h
View file

@ -67,7 +67,7 @@ class AudioTrack : public Track
boost::shared_ptr<AudioDiskstream> audio_diskstream () const; boost::shared_ptr<AudioDiskstream> audio_diskstream () const;
XMLNode& state (bool full); XMLNode& state (bool full);
int _set_state (const XMLNode&, int, bool call_base); int _set_state (const XMLNode&, int);
private: private:
int deprecated_use_diskstream_connections (); int deprecated_use_diskstream_connections ();

2
libs/ardour/ardour/midi_track.h
View file

@ -113,7 +113,7 @@ public:
protected: protected:
XMLNode& state (bool full); XMLNode& state (bool full);
int _set_state (const XMLNode&, int, bool call_base); int _set_state (const XMLNode&, int);
bool should_monitor () const; bool should_monitor () const;
bool send_silence () const; bool send_silence () const;

2
libs/ardour/ardour/route.h
View file

@ -491,7 +491,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
virtual bool should_monitor () const; virtual bool should_monitor () const;
virtual void maybe_declick (BufferSet&, framecnt_t, int); 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<Amp> _amp;
boost::shared_ptr<PeakMeter> _meter; boost::shared_ptr<PeakMeter> _meter;

2
libs/ardour/ardour/track.h
View file

@ -162,7 +162,7 @@ class Track : public Route, public PublicDiskstream
protected: protected:
XMLNode& state (bool full); XMLNode& state (bool full);
int _set_state (const XMLNode&, int version, bool); int _set_state (const XMLNode&, int version);
boost::shared_ptr<Diskstream> _diskstream; boost::shared_ptr<Diskstream> _diskstream;
MeterPoint _saved_meter_point; MeterPoint _saved_meter_point;

10
libs/ardour/audio_track.cc
View file

@ -201,20 +201,18 @@ AudioTrack::deprecated_use_diskstream_connections ()
int int
AudioTrack::set_state (const XMLNode& node, int version) AudioTrack::set_state (const XMLNode& node, int version)
{ {
return _set_state (node, version, true); return _set_state (node, version);
} }
int int
AudioTrack::_set_state (const XMLNode& node, int version, bool call_base) AudioTrack::_set_state (const XMLNode& node, int version)
{ {
const XMLProperty *prop; const XMLProperty *prop;
XMLNodeConstIterator iter; XMLNodeConstIterator iter;
XMLNode *child; XMLNode *child;
if (call_base) { if (Track::_set_state (node, version)) {
if (Track::_set_state (node, version, call_base)) { return -1;
return -1;
}
} }
if ((prop = node.property (X_("mode"))) != 0) { if ((prop = node.property (X_("mode"))) != 0) {

10
libs/ardour/midi_track.cc
View file

@ -136,19 +136,17 @@ MidiTrack::midi_diskstream() const
int int
MidiTrack::set_state (const XMLNode& node, int version) MidiTrack::set_state (const XMLNode& node, int version)
{ {
return _set_state (node, version, true); return _set_state (node, version);
} }
int int
MidiTrack::_set_state (const XMLNode& node, int version, bool call_base) MidiTrack::_set_state (const XMLNode& node, int version)
{ {
const XMLProperty *prop; const XMLProperty *prop;
XMLNodeConstIterator iter; XMLNodeConstIterator iter;
if (call_base) { if (Track::_set_state (node, version)) {
if (Track::_set_state (node, version, call_base)) { return -1;
return -1;
}
} }
// No destructive MIDI tracks (yet?) // No destructive MIDI tracks (yet?)

4
libs/ardour/route.cc
View file

@ -1884,11 +1884,11 @@ Route::state(bool full_state)
int int
Route::set_state (const XMLNode& node, int version) Route::set_state (const XMLNode& node, int version)
{ {
return _set_state (node, version, true); return _set_state (node, version);
} }
int int
Route::_set_state (const XMLNode& node, int version, bool /*call_base*/) Route::_set_state (const XMLNode& node, int version)
{ {
if (version < 3000) { if (version < 3000) {
return _set_state_2X (node, version); return _set_state_2X (node, version);

10
libs/ardour/track.cc
View file

@ -82,16 +82,14 @@ Track::state (bool full)
int int
Track::set_state (const XMLNode& node, int version) Track::set_state (const XMLNode& node, int version)
{ {
return _set_state (node, version, true); return _set_state (node, version);
} }
int 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)) {
if (Route::_set_state (node, version, call_base)) { return -1;
return -1;
}
} }
const XMLProperty* prop; const XMLProperty* prop;