clean up HitCreateDrag. should be a no-op.

[ardour.git] / gtk2_ardour / return_ui.h

diff --git a/gtk2_ardour/return_ui.h b/gtk2_ardour/return_ui.h
index 3a5e3c8f3fa8a7b75d318abe5e5cfaed2b4d3a4c..353985110d642163745a531b5c7394f236478ffb 100644 (file)
--- a/gtk2_ardour/return_ui.h
+++ b/gtk2_ardour/return_ui.h
@@ -22,11 +22,10 @@
 
 #include "gain_meter.h"
 #include "panner_ui.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
 namespace ARDOUR {
        class Return;
-       class Session;
        class IOProcessor;
 }
 
@@ -35,7 +34,7 @@ class IOSelector;
 class ReturnUI : public Gtk::HBox
 {
   public:
-       ReturnUI (Gtk::Window *,boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session&);
+       ReturnUI (Gtk::Window *,boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session*);
        ~ReturnUI();
 
        void update ();
@@ -47,21 +46,21 @@ class ReturnUI : public Gtk::HBox
 
   private:
        boost::shared_ptr<ARDOUR::Return> _return;
-       ARDOUR::Session&                  _session;
        GainMeter                         _gpm;
        Gtk::VBox                         _vbox;
        Gtk::VBox                         _hbox;
 
        sigc::connection screen_update_connection;
        sigc::connection fast_screen_update_connection;
+       PBD::ScopedConnection input_change_connection;
 
        void ins_changed (ARDOUR::IOChange, void*);
 };
 
-class ReturnUIWindow : public ArdourDialog
+class ReturnUIWindow : public ArdourWindow
 {
   public:
-       ReturnUIWindow(boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session&);
+       ReturnUIWindow(boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session*);
        ~ReturnUIWindow();
 
        ReturnUI* ui;
@@ -69,8 +68,7 @@ class ReturnUIWindow : public ArdourDialog
   private:
        Gtk::HBox hpacker;
 
-       void return_going_away ();
-       sigc::connection going_away_connection;
+       PBD::ScopedConnection going_away_connection;
 };
 
 #endif /* __ardour_gtk_return_ui_h__ */