X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fpanner2d.h;h=881638856f9f8ee5279b88bc0d28a310905e0fd4;hb=c9c94ca1c247adfc1a78fda0eda185a9a7589696;hp=6726d5f7cf04f93d38701c77edbc411794ae701b;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h index 6726d5f7cf..881638856f 100644 --- a/gtk2_ardour/panner2d.h +++ b/gtk2_ardour/panner2d.h @@ -34,10 +34,10 @@ #include "pbd/cartesian.h" -#include "ardour_dialog.h" +#include "ardour_window.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, int32_t height); + Panner2d (boost::shared_ptr, 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 get_panner() const { return panner; } + boost::shared_ptr get_panner_shell() const { return panner_shell; } sigc::signal PuckMoved; sigc::signal TargetMoved; @@ -102,7 +102,7 @@ class Panner2d : public Gtk::DrawingArea bool _selected; }; - boost::shared_ptr panner; + boost::shared_ptr panner_shell; Glib::RefPtr layout; typedef std::vector Targets; @@ -143,10 +143,10 @@ class Panner2d : public Gtk::DrawingArea void clamp_to_circle (double& x, double& y); }; -class Panner2dWindow : public ArdourDialog +class Panner2dWindow : public ArdourWindow { public: - Panner2dWindow (boost::shared_ptr, int32_t height, uint32_t inputs); + Panner2dWindow (boost::shared_ptr, int32_t height, uint32_t inputs); void reset (uint32_t n_inputs);