Remove use of invalidated iterator (#4826).

[ardour.git] / gtk2_ardour / panner_ui.cc

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 8b39c9f290513c3872d5269bf5b443d77af981b8..51255d329111cd4b11a8f3a82ee599c24cf9d975 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -144,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)));
@@ -219,14 +222,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;
        }
 
@@ -242,16 +241,20 @@ PannerUI::setup_pan ()
        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) {
@@ -304,6 +307,8 @@ PannerUI::setup_pan ()
                                                    nins) << endmsg;
                 }
 
+               delete big_window;
+               big_window = 0;
 
        } else {
 
@@ -510,7 +515,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;
@@ -547,7 +552,7 @@ PannerUI::_astate_string (AutoState state, bool shrt)
        string sstr;
 
        switch (state) {
-       case Off:
+       case ARDOUR::Off:
                sstr = (shrt ? "M" : _("M"));
                break;
        case Play: