Standardize drawing of PixFader and BarController; implement flat_buttons and prelight.

[ardour.git] / gtk2_ardour / panner_ui.cc

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 0c57fab244caafc5ccbf23e00cf83515ec326d07..f35c79d4fe7cc2ba77184048cb1032e987480835 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -19,7 +19,6 @@
 #include <limits.h>
 
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/barcontroller.h>
 
 #include "pbd/fastlog.h"
 
@@ -31,7 +30,6 @@
 #include "ardour_ui.h"
 #include "panner_ui.h"
 #include "panner2d.h"
-#include "utils.h"
 #include "gui_thread.h"
 #include "stereo_panner.h"
 #include "mono_panner.h"
@@ -49,6 +47,8 @@ const int PannerUI::pan_bar_height = 35;
 PannerUI::PannerUI (Session* s)
        : _current_nouts (-1)
        , _current_nins (-1)
+       , _current_uri ("")
+       , _send_mode (false)
        , pan_automation_style_button ("")
        , pan_automation_state_button ("")
        , _panner_list()
@@ -214,12 +214,17 @@ PannerUI::setup_pan ()
        int const nouts = _panner ? _panner->out().n_audio() : -1;
        int const nins = _panner ? _panner->in().n_audio() : -1;
 
-       if (nouts == _current_nouts && nins == _current_nins) {
+       if (nouts == _current_nouts
+                       && nins == _current_nins
+                       && _current_uri == _panshell->panner_gui_uri()
+                       )
+       {
                return;
        }
 
         _current_nins = nins;
         _current_nouts = nouts;
+        _current_uri = _panshell->panner_gui_uri();
 
         container_clear (pan_vbox);
 
@@ -236,7 +241,7 @@ PannerUI::setup_pan ()
                return;
        }
 
-       if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_2in2out#ui")
+       if (_current_uri == "http://ardour.org/plugin/panner_2in2out#ui")
        {
                delete big_window;
                big_window = 0;
@@ -245,6 +250,7 @@ PannerUI::setup_pan ()
 
                _stereo_panner = new StereoPanner (_panshell);
                _stereo_panner->set_size_request (-1, pan_bar_height);
+               _stereo_panner->set_send_drawing_mode (_send_mode);
                pan_vbox.pack_start (*_stereo_panner, false, false);
 
                boost::shared_ptr<AutomationControl> ac;
@@ -262,8 +268,8 @@ PannerUI::setup_pan ()
                                        boost::weak_ptr<AutomationControl>(ac)));
                _stereo_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event));
        }
-       else if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_1in2out#ui"
-                       || _panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_balance#ui")
+       else if (_current_uri == "http://ardour.org/plugin/panner_1in2out#ui"
+                       || _current_uri == "http://ardour.org/plugin/panner_balance#ui")
        {
                delete big_window;
                big_window = 0;
@@ -280,11 +286,12 @@ PannerUI::setup_pan ()
                _mono_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event));
 
                _mono_panner->set_size_request (-1, pan_bar_height);
+               _mono_panner->set_send_drawing_mode (_send_mode);
 
                update_pan_sensitive ();
                pan_vbox.pack_start (*_mono_panner, false, false);
        }
-       else if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_vbap#ui")
+       else if (_current_uri == "http://ardour.org/plugin/panner_vbap#ui")
        {
                if (!twod_panner) {
                        twod_panner = new Panner2d (_panshell, 61);
@@ -299,6 +306,7 @@ PannerUI::setup_pan ()
                        big_window->reset (nins);
                }
                twod_panner->set_size_request (-1, 61);
+               twod_panner->set_send_drawing_mode (_send_mode);
 
                /* and finally, add it to the panner frame */
 
@@ -317,6 +325,19 @@ PannerUI::setup_pan ()
        pan_vbox.show_all ();
 }
 
+void
+PannerUI::set_send_drawing_mode (bool onoff)
+{
+       if (_stereo_panner) {
+               _stereo_panner->set_send_drawing_mode (onoff);
+       } else if (_mono_panner) {
+               _mono_panner->set_send_drawing_mode (onoff);
+       } else if (twod_panner) {
+               twod_panner->set_send_drawing_mode (onoff);
+       }
+       _send_mode = onoff;
+}
+
 void
 PannerUI::start_touch (boost::weak_ptr<AutomationControl> wac)
 {
@@ -392,9 +413,6 @@ PannerUI::build_pan_menu ()
                RadioMenuItem::Group group;
                items.push_back (SeparatorElem());
 
-               assert(_panshell->user_selected_panner_uri() == ""
-                               ||  _panshell->user_selected_panner_uri() == _panshell->current_panner_uri());
-
                _suspend_menu_callbacks = true;
                for (std::map<std::string,std::string>::const_iterator p = _panner_list.begin(); p != _panner_list.end(); ++p) {
                        items.push_back (RadioMenuElem (group, p->second,