diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-11-16 22:26:49 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-11-16 22:26:49 +0000 |
| commit | 58dbe9ed13cede08f9e11f428fa6c188325db009 (patch) | |
| tree | 47613ea4be822656639b8e2138daf07d2f934a49 /libs/ardour/ardour/route.h | |
| parent | 63ed921cc6824d05c633fe629ff5c620346e84d5 (diff) | |
Remove set_state / _set_state dance in Route hierarchy
that seems to have been a hangover from when _set_state
was called in constructors.
git-svn-id: svn://localhost/ardour2/branches/3.0@10654 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/route.h')
| -rw-r--r-- | libs/ardour/ardour/route.h | 6 |
1 files changed, 2 insertions, 4 deletions
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; |