add VU and IEC meter DSP (from jmeters)

[ardour.git] / gtk2_ardour / panner_ui.cc

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 16d7a19009208656d5ceef7082391cc02e3faed2..181664bb4ec0db1f360b16fe5713d8a9fd3edf87 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -18,13 +18,17 @@
 
 #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 +37,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;
@@ -64,6 +61,7 @@ PannerUI::PannerUI (Session* s)
        pan_astyle_menu = 0;
        in_pan_update = false;
         _stereo_panner = 0;
+       _mono_panner = 0;
         _ignore_width_change = false;
         _ignore_position_change = false;
 
@@ -114,6 +112,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;
        }
@@ -143,9 +144,12 @@ PannerUI::build_astate_menu ()
                pan_astate_menu->items().clear ();
        }
 
-       pan_astate_menu->items().push_back (MenuElem (_("Manual"), sigc::bind (
+       /** TRANSLATORS: this is `Manual' in the sense of automation not being played,
+           so that changes to pan must be done by hand.
+       */
+       pan_astate_menu->items().push_back (MenuElem (S_("Automation|Manual"), sigc::bind (
                        sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
-                       (AutoState) Off)));
+                       (AutoState) ARDOUR::Off)));
        pan_astate_menu->items().push_back (MenuElem (_("Play"), sigc::bind (
                        sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
                        (AutoState) Play)));
@@ -174,13 +178,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)
 {
@@ -195,10 +192,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;
@@ -218,14 +211,10 @@ PannerUI::panshell_changed ()
 void
 PannerUI::setup_pan ()
 {
-       if (!_panner) {
-               return;
-       }
+       int const nouts = _panner ? _panner->out().n_audio() : -1;
+       int const nins = _panner ? _panner->in().n_audio() : -1;
 
-       uint32_t const nouts = _panner->out().n_audio();
-       uint32_t const nins = _panner->in().n_audio();
-
-       if (int32_t (nouts) == _current_nouts && int32_t (nins) == _current_nins) {
+       if (nouts == _current_nouts && nins == _current_nins) {
                return;
        }
 
@@ -238,17 +227,23 @@ PannerUI::setup_pan ()
         twod_panner = 0;
         delete _stereo_panner;
         _stereo_panner = 0;
+       delete _mono_panner;
+       _mono_panner = 0;
 
-       if (nouts == 0 || nouts == 1) {
+       if (!_panner) {
+               return;
+       }
 
-                delete _stereo_panner;
-                delete twod_panner;
+       if (nouts == 0 || nouts == 1) {
 
                /* stick something into the panning viewport so that it redraws */
 
                EventBox* eb = manage (new EventBox());
                pan_vbox.pack_start (*eb, false, false);
 
+               delete big_window;
+               big_window = 0;
+
        } else if (nouts == 2) {
 
                 if (nins == 2) {
@@ -301,6 +296,8 @@ PannerUI::setup_pan ()
                                                    nins) << endmsg;
                 }
 
+               delete big_window;
+               big_window = 0;
 
        } else {
 
@@ -393,6 +390,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
@@ -403,6 +401,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 ()
 {
@@ -414,13 +422,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
@@ -507,7 +513,7 @@ PannerUI::pan_automation_state_changed ()
                break;
        }
 
-       bool x = (pannable->automation_state() != Off);
+       bool x = (pannable->automation_state() != ARDOUR::Off);
 
        if (pan_automation_state_button.get_active() != x) {
                 ignore_toggle = true;
@@ -544,7 +550,7 @@ PannerUI::_astate_string (AutoState state, bool shrt)
        string sstr;
 
        switch (state) {
-       case Off:
+       case ARDOUR::Off:
                sstr = (shrt ? "M" : _("M"));
                break;
        case Play: