merge robin gareus' libltc into ardour source tree for convenience

[ardour.git] / gtk2_ardour / panner2d.h

diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index 718677557f7670ab31b961bb1f96bd2d9a9abbb8..881638856f9f8ee5279b88bc0d28a310905e0fd4 100644 (file)
--- 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<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;
@@ -86,23 +86,23 @@ class Panner2d : public Gtk::DrawingArea
                PBD::AngularVector position;
                bool visible;
                std::string text;
-                
+
                Target (const PBD::AngularVector&, const char* txt = 0);
                ~Target ();
-                
+
                void set_text (const char*);
                void set_selected (bool yn) {
                        _selected = yn;
                }
-               bool selected() const { 
+               bool selected() const {
                        return _selected;
                }
-                
+
        private:
                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;
@@ -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<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);