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 /gtk2_ardour/panner2d.h | |
| 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 'gtk2_ardour/panner2d.h')
| -rw-r--r-- | gtk2_ardour/panner2d.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h index 6726d5f7cf..eb938be8f0 100644 --- a/gtk2_ardour/panner2d.h +++ b/gtk2_ardour/panner2d.h @@ -37,7 +37,7 @@ #include "ardour_dialog.h" namespace ARDOUR { - class Panner; + class PannerShell; } namespace Gtk { @@ -54,7 +54,7 @@ class Panner2dWindow; class Panner2d : public Gtk::DrawingArea { public: - Panner2d (boost::shared_ptr<ARDOUR::Panner>, int32_t height); + Panner2d (boost::shared_ptr<ARDOUR::PannerShell>, int32_t height); ~Panner2d (); void allow_target_motion (bool); @@ -64,7 +64,7 @@ class Panner2d : public Gtk::DrawingArea void move_signal (int which, const PBD::AngularVector&); void reset (uint32_t n_inputs); - boost::shared_ptr<ARDOUR::Panner> get_panner() const { return panner; } + boost::shared_ptr<ARDOUR::PannerShell> get_panner_shell() const { return panner_shell; } sigc::signal<void,int> PuckMoved; sigc::signal<void,int> TargetMoved; @@ -102,7 +102,7 @@ class Panner2d : public Gtk::DrawingArea bool _selected; }; - boost::shared_ptr<ARDOUR::Panner> panner; + boost::shared_ptr<ARDOUR::PannerShell> panner_shell; Glib::RefPtr<Pango::Layout> layout; typedef std::vector<Target*> Targets; @@ -146,7 +146,7 @@ class Panner2d : public Gtk::DrawingArea class Panner2dWindow : public ArdourDialog { public: - Panner2dWindow (boost::shared_ptr<ARDOUR::Panner>, int32_t height, uint32_t inputs); + Panner2dWindow (boost::shared_ptr<ARDOUR::PannerShell>, int32_t height, uint32_t inputs); void reset (uint32_t n_inputs); |