Remove unused call_base parameter from Route::_set_state.
git-svn-id: svn://localhost/ardour2/branches/3.0@10302 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
ea01b6024d
commit
24056f055f
|
@ -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 ();
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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?)
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user