Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / panner_ui.cc

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index ce2f0aec8360f37e28880c216683e53bf7883363..7447011e80d1f5c64ec25c2f753f244255136434 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -231,11 +231,16 @@ PannerUI::setup_pan ()
        _mono_panner = 0;
 
        if (!_panner) {
+               delete big_window;
+               big_window = 0;
                return;
        }
 
        if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_2in2out#ui")
        {
+               delete big_window;
+               big_window = 0;
+
                boost::shared_ptr<Pannable> pannable = _panner->pannable();
 
                _stereo_panner = new StereoPanner (_panshell);
@@ -260,6 +265,8 @@ PannerUI::setup_pan ()
        else if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_1in2out#ui"
                        || _panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_balance#ui")
        {
+               delete big_window;
+               big_window = 0;
                boost::shared_ptr<Pannable> pannable = _panner->pannable();
                boost::shared_ptr<AutomationControl> ac = pannable->pan_azimuth_control;
 
@@ -381,13 +388,10 @@ PannerUI::build_pan_menu ()
                items.push_back (MenuElem (_("Edit..."), sigc::mem_fun (*this, &PannerUI::pan_edit)));
        }
 
-       if (_route && _panner_list.size() > 1 && !_panshell->bypassed()) {
+       if (_panner_list.size() > 1 && !_panshell->bypassed()) {
                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,
@@ -417,6 +421,11 @@ PannerUI::pan_edit ()
                _mono_panner->edit ();
        } else if (_stereo_panner) {
                _stereo_panner->edit ();
+       } else if (twod_panner) {
+               if (!big_window) {
+                       big_window = new Panner2dWindow (_panshell, 400, _panner->in().n_audio());
+               }
+               big_window->show ();
        }
 }
 
@@ -432,9 +441,7 @@ PannerUI::pan_reset ()
 void
 PannerUI::pan_set_custom_type (std::string uri) {
        if (_suspend_menu_callbacks) return;
-       if (_route) {
-               _route->set_custom_panner_uri(uri);
-       }
+       _panshell->select_panner_by_uri(uri);
 }
 
 void
@@ -632,8 +639,7 @@ PannerUI::position_adjusted ()
 }
 
 void
-PannerUI::set_available_panners(boost::shared_ptr<ARDOUR::Route> r, std::map<std::string,std::string> p)
+PannerUI::set_available_panners(std::map<std::string,std::string> p)
 {
-       _route = r;
        _panner_list = p;
 }