Set up piano roll and scroomer objects before the MidiTimeAxisView height gets set...

[ardour.git] / gtk2_ardour / panner_ui.cc

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index b10bb19c136831874be8e41cb650412d1a0e620d..6c594b4260e7f02416ac2b43fb1feeebc3ea5239 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -64,6 +64,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;
 
@@ -119,7 +120,6 @@ PannerUI::set_panner (boost::shared_ptr<PannerShell> ps, boost::shared_ptr<Panne
        }
 
        _panshell->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::panshell_changed, this), gui_context());
-       _panner->StateChanged.connect (connections, invalidator (*this), boost::bind (&PannerUI::update_pan_state, this), gui_context());
 
         /* new panner object, force complete reset of panner GUI
          */
@@ -144,7 +144,10 @@ 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)));
        pan_astate_menu->items().push_back (MenuElem (_("Play"), sigc::bind (
@@ -206,9 +209,9 @@ PannerUI::~PannerUI ()
        delete pan_astyle_menu;
        delete pan_astate_menu;
         delete _stereo_panner;
+        delete _mono_panner;
 }
 
-
 void
 PannerUI::panshell_changed ()
 {
@@ -216,23 +219,13 @@ PannerUI::panshell_changed ()
        setup_pan ();
 }
 
-void
-PannerUI::update_pan_state ()
-{
-       /* currently nothing to do */
-}
-
 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;
        }
 
@@ -245,17 +238,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) {
@@ -286,34 +285,35 @@ PannerUI::setup_pan ()
                 } else if (nins == 1) {
                         /* 1-in/2out */
 
-                        MonoPanner* mp;
                         boost::shared_ptr<Pannable> pannable = _panner->pannable();
                         boost::shared_ptr<AutomationControl> ac = pannable->pan_azimuth_control;
 
-                        mp = new MonoPanner (ac);
-
-                        mp->StartGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch),
+                        _mono_panner = new MonoPanner (_panner);
+                       
+                        _mono_panner->StartGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch),
                                                                       boost::weak_ptr<AutomationControl> (ac)));
-                        mp->StopGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch),
+                        _mono_panner->StopGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch),
                                                              boost::weak_ptr<AutomationControl>(ac)));
 
-                        mp->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event));
+                        _mono_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event));
 
-                        mp->set_size_request (-1, pan_bar_height);
+                        _mono_panner->set_size_request (-1, pan_bar_height);
 
                         update_pan_sensitive ();
-                        pan_vbox.pack_start (*mp, false, false);
+                        pan_vbox.pack_start (*_mono_panner, false, false);
 
                 } else {
                         warning << string_compose (_("No panner user interface is currently available for %1-in/2out tracks/busses"),
                                                    nins) << endmsg;
                 }
 
+               delete big_window;
+               big_window = 0;
 
        } else {
 
                if (!twod_panner) {
-                       twod_panner = new Panner2d (_panner, 61);
+                       twod_panner = new Panner2d (_panshell, 61);
                        twod_panner->set_name ("MixerPanZone");
                        twod_panner->show ();
                        twod_panner->signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event), false);
@@ -361,7 +361,7 @@ PannerUI::pan_button_event (GdkEventButton* ev)
        case 1:
                if (twod_panner && ev->type == GDK_2BUTTON_PRESS) {
                        if (!big_window) {
-                               big_window = new Panner2dWindow (_panner, 400, _panner->in().n_audio());
+                               big_window = new Panner2dWindow (_panshell, 400, _panner->in().n_audio());
                        }
                        big_window->show ();
                        return true;
@@ -397,7 +397,7 @@ PannerUI::build_pan_menu ()
 
        /* set state first, connect second */
 
-       bypass_menu_item->set_active (_panner->bypassed());
+       bypass_menu_item->set_active (_panshell->bypassed());
        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)));
@@ -406,8 +406,8 @@ PannerUI::build_pan_menu ()
 void
 PannerUI::pan_bypass_toggle ()
 {
-       if (bypass_menu_item && (_panner->bypassed() != bypass_menu_item->get_active())) {
-               _panner->set_bypassed (!_panner->bypassed());
+       if (bypass_menu_item && (_panshell->bypassed() != bypass_menu_item->get_active())) {
+               _panshell->set_bypassed (!_panshell->bypassed());
        }
 }