Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / panner_ui.cc

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 51255d329111cd4b11a8f3a82ee599c24cf9d975..95d7491921155a77440249189a504cf4051edd0e 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -18,13 +18,16 @@
 
 #include <limits.h>
 
-#include "ardour/io.h"
-#include "ardour/dB.h"
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/barcontroller.h>
-#include "midi++/manager.h"
+
 #include "pbd/fastlog.h"
 
+#include "ardour/pannable.h"
+#include "ardour/panner.h"
+#include "ardour/panner_shell.h"
+#include "ardour/session.h"
+
 #include "ardour_ui.h"
 #include "panner_ui.h"
 #include "panner2d.h"
@@ -33,13 +36,6 @@
 #include "stereo_panner.h"
 #include "mono_panner.h"
 
-#include "ardour/delivery.h"
-#include "ardour/session.h"
-#include "ardour/panner.h"
-#include "ardour/pannable.h"
-#include "ardour/panner_shell.h"
-#include "ardour/route.h"
-
 #include "i18n.h"
 
 using namespace std;
@@ -115,6 +111,9 @@ PannerUI::set_panner (boost::shared_ptr<PannerShell> ps, boost::shared_ptr<Panne
         delete _stereo_panner;
         _stereo_panner = 0;
 
+        delete _mono_panner;
+        _mono_panner = 0;
+
        if (!_panner) {
                return;
        }
@@ -178,13 +177,6 @@ PannerUI::build_astyle_menu ()
        pan_astyle_menu->items().push_back (MenuElem (_("Abs")));
 }
 
-boost::shared_ptr<PBD::Controllable>
-PannerUI::get_controllable()
-{
-        assert (!pan_bars.empty());
-       return pan_bars[0]->get_controllable();
-}
-
 void
 PannerUI::on_size_allocate (Allocation& a)
 {
@@ -199,10 +191,6 @@ PannerUI::set_width (Width w)
 
 PannerUI::~PannerUI ()
 {
-       for (vector<MonoPanner*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
-               delete (*i);
-       }
-
        delete twod_panner;
        delete big_window;
        delete pan_menu;
@@ -393,7 +381,7 @@ PannerUI::build_pan_menu ()
        items.clear ();
 
        items.push_back (CheckMenuElem (_("Bypass"), sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle)));
-       bypass_menu_item = static_cast<CheckMenuItem*> (&items.back());
+       bypass_menu_item = static_cast<Gtk::CheckMenuItem*> (&items.back());
 
        /* set state first, connect second */
 
@@ -401,6 +389,7 @@ PannerUI::build_pan_menu ()
        bypass_menu_item->signal_toggled().connect (sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle));
 
        items.push_back (MenuElem (_("Reset"), sigc::mem_fun (*this, &PannerUI::pan_reset)));
+       items.push_back (MenuElem (_("Edit..."), sigc::mem_fun (*this, &PannerUI::pan_edit)));
 }
 
 void
@@ -411,6 +400,16 @@ PannerUI::pan_bypass_toggle ()
        }
 }
 
+void
+PannerUI::pan_edit ()
+{
+       if (_mono_panner) {
+               _mono_panner->edit ();
+       } else if (_stereo_panner) {
+               _stereo_panner->edit ();
+       }
+}
+
 void
 PannerUI::pan_reset ()
 {
@@ -422,13 +421,11 @@ PannerUI::effective_pan_display ()
 {
         if (_stereo_panner) {
                 _stereo_panner->queue_draw ();
+        } else if (_mono_panner) {
+                _mono_panner->queue_draw ();
         } else if (twod_panner) {
                 twod_panner->queue_draw ();
-        } else {
-                for (vector<MonoPanner*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
-                        (*i)->queue_draw ();
-                }
-       }
+        }
 }
 
 void