diff options
author | Carl Hetherington <carl@carlh.net> | 2011-07-14 22:17:43 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2011-07-14 22:17:43 +0000 |
commit | 48de21b1201fdf828c32ab396ac75dc884a96d90 (patch) | |
tree | ac89601041c49a8f572668ede9883fe2ab0ca20e /libs/panners/2in2out | |
parent | a5efa9a500d2c1b592656e91e9ea7ef7d535dcb3 (diff) |
Move panner bypass state up to the PannerShell so that it is preserved even when new Panners are dropped in (refixes #4185).
git-svn-id: svn://localhost/ardour2/branches/3.0@9877 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/panners/2in2out')
-rw-r--r-- | libs/panners/2in2out/panner_2in2out.cc | 16 | ||||
-rw-r--r-- | libs/panners/2in2out/panner_2in2out.h | 4 |
2 files changed, 2 insertions, 18 deletions
diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc index 0c5184efe6..1ac3974c49 100644 --- a/libs/panners/2in2out/panner_2in2out.cc +++ b/libs/panners/2in2out/panner_2in2out.cc @@ -435,27 +435,13 @@ Panner2in2out::factory (boost::shared_ptr<Pannable> p, boost::shared_ptr<Speaker } XMLNode& -Panner2in2out::get_state (void) -{ - return state (true); -} - -XMLNode& -Panner2in2out::state (bool /*full_state*/) +Panner2in2out::get_state () { XMLNode& root (Panner::get_state ()); root.add_property (X_("type"), _descriptor.name); return root; } -int -Panner2in2out::set_state (const XMLNode& node, int version) -{ - LocaleGuard lg (X_("POSIX")); - Panner::set_state (node, version); - return 0; -} - std::set<Evoral::Parameter> Panner2in2out::what_can_be_automated() const { diff --git a/libs/panners/2in2out/panner_2in2out.h b/libs/panners/2in2out/panner_2in2out.h index b9b9a73dfb..48f441fbd0 100644 --- a/libs/panners/2in2out/panner_2in2out.h +++ b/libs/panners/2in2out/panner_2in2out.h @@ -62,9 +62,7 @@ class Panner2in2out : public Panner std::string describe_parameter (Evoral::Parameter); std::string value_as_string (boost::shared_ptr<AutomationControl>) const; - XMLNode& state (bool full_state); - XMLNode& get_state (void); - int set_state (const XMLNode&, int version); + XMLNode& get_state (); void update (); |