projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Move panner bypass state up to the PannerShell so that it is preserved even when...
[ardour.git] / gtk2_ardour / panner_ui.cc
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index af207c20c13a6a43cb0fbcf8c77a2e9f7bdeba1b..71a982124226ffc778a63605dd7b8ddc5e3fc124 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -37,6 +37,7 @@
 #include "ardour/session.h"
 #include "ardour/panner.h"
 #include "ardour/pannable.h"
+#include "ardour/panner_shell.h"
 #include "ardour/route.h"
 
 #include "i18n.h"
@@ -47,7 +48,7 @@ using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
 
-const int PannerUI::pan_bar_height = 40;
+const int PannerUI::pan_bar_height = 35;
 
 PannerUI::PannerUI (Session* s)
        : _current_nouts (-1)
@@ -91,8 +92,11 @@ PannerUI::PannerUI (Session* s)
 }
 
 void
-PannerUI::set_panner (boost::shared_ptr<Panner> p)
+PannerUI::set_panner (boost::shared_ptr<PannerShell> ps, boost::shared_ptr<Panner> p)
 {
+        /* note that the panshell might not change here (i.e. ps == _panshell)
+         */
+
        connections.drop_connections ();
 
        delete pan_astyle_menu;
@@ -101,6 +105,7 @@ PannerUI::set_panner (boost::shared_ptr<Panner> p)
        delete pan_astate_menu;
        pan_astate_menu = 0;
 
+        _panshell = ps;
        _panner = p;
 
        delete twod_panner;
@@ -113,8 +118,7 @@ PannerUI::set_panner (boost::shared_ptr<Panner> p)
                return;
        }
 
-       _panner->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::panner_changed, this, this), gui_context());
-       _panner->StateChanged.connect (connections, invalidator (*this), boost::bind (&PannerUI::update_pan_state, this), gui_context());
+       _panshell->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::panshell_changed, this), gui_context());
 
         /* new panner object, force complete reset of panner GUI
          */
@@ -122,10 +126,9 @@ PannerUI::set_panner (boost::shared_ptr<Panner> p)
         _current_nouts = 0;
         _current_nins = 0;
 
-       panner_changed (0);
+        setup_pan ();
        update_pan_sensitive ();
        pan_automation_state_changed ();
-
 }
 
 void
@@ -206,23 +209,19 @@ PannerUI::~PannerUI ()
 
 
 void
-PannerUI::panner_changed (void* src)
+PannerUI::panshell_changed ()
 {
+        set_panner (_panshell, _panshell->panner());
        setup_pan ();
 }
 
-void
-PannerUI::update_pan_state ()
-{
-       /* currently nothing to do */
-}
-
 void
 PannerUI::setup_pan ()
 {
        if (!_panner) {
                return;
-       } 
+       }
+
        uint32_t const nouts = _panner->out().n_audio();
        uint32_t const nins = _panner->in().n_audio();
 
@@ -230,13 +229,16 @@ PannerUI::setup_pan ()
                return;
        }
 
+        _current_nins = nins;
+        _current_nouts = nouts;
+
         container_clear (pan_vbox);
 
         delete twod_panner;
         twod_panner = 0;
         delete _stereo_panner;
         _stereo_panner = 0;
-        
+
        if (nouts == 0 || nouts == 1) {
 
                 delete _stereo_panner;
@@ -262,35 +264,36 @@ PannerUI::setup_pan ()
                         boost::shared_ptr<AutomationControl> ac;
 
                         ac = pannable->pan_azimuth_control;
-                        _stereo_panner->StartPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), 
-                                                              boost::weak_ptr<AutomationControl> (ac)));
-                        _stereo_panner->StopPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), 
-                                                             boost::weak_ptr<AutomationControl>(ac)));
+                        _stereo_panner->StartPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch),
+                                                                                  boost::weak_ptr<AutomationControl> (ac)));
+                        _stereo_panner->StopPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch),
+                                                                                 boost::weak_ptr<AutomationControl>(ac)));
 
                         ac = pannable->pan_width_control;
-                        _stereo_panner->StartWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), 
-                                                              boost::weak_ptr<AutomationControl> (ac)));
-                        _stereo_panner->StopWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), 
-                                                             boost::weak_ptr<AutomationControl>(ac)));
+                        _stereo_panner->StartWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch),
+                                                                               boost::weak_ptr<AutomationControl> (ac)));
+                        _stereo_panner->StopWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch),
+                                                                              boost::weak_ptr<AutomationControl>(ac)));
+                        _stereo_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event));
 
                 } 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), 
+
+                        mp->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), 
+                        mp->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));
-                        
+
                         mp->set_size_request (-1, pan_bar_height);
-                        
+
                         update_pan_sensitive ();
                         pan_vbox.pack_start (*mp, false, false);
 
@@ -303,7 +306,7 @@ PannerUI::setup_pan ()
        } 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);
@@ -351,7 +354,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;
@@ -387,7 +390,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)));
@@ -396,8 +399,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());
        }
 }
 
@@ -426,9 +429,8 @@ PannerUI::update_pan_sensitive ()
 {
        bool const sensitive = !(_panner->pannable()->automation_state() & Play);
 
-#ifdef PANNER_HACKS
         pan_vbox.set_sensitive (sensitive);
-#endif
+
         if (big_window) {
                 big_window->set_sensitive (sensitive);
         }
@@ -507,7 +509,7 @@ PannerUI::pan_automation_state_changed ()
        }
 
        bool x = (pannable->automation_state() != Off);
-        
+
        if (pan_automation_state_button.get_active() != x) {
                 ignore_toggle = true;
                pan_automation_state_button.set_active (x);
@@ -515,11 +517,11 @@ PannerUI::pan_automation_state_changed ()
        }
 
        update_pan_sensitive ();
-        
+
        /* start watching automation so that things move */
-        
+
        pan_watching.disconnect();
-        
+
        if (x) {
                pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display));
        }
Unnamed repository; edit this file 'description' to name the repository.