diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-02-07 19:00:44 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-02-07 19:00:44 -0500 |
| commit | 2a7ed69c28c5c4606ff13b3605b9bc9c3eba607d (patch) | |
| tree | 8bc1cbb9df7bab6bafac672d11ce6e63f3a8542d /gtk2_ardour/panner_ui.cc | |
| parent | 89d5be353addf41e0d6cdf5c70cdc988a0c3d19a (diff) | |
| parent | d47fe167e3c1dc44e4114227b0e8b83b40b35169 (diff) | |
merge with master, with minor conflict fixes
Diffstat (limited to 'gtk2_ardour/panner_ui.cc')
| -rw-r--r-- | gtk2_ardour/panner_ui.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 7447011e80..d20d719b14 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -49,6 +49,7 @@ const int PannerUI::pan_bar_height = 35; PannerUI::PannerUI (Session* s) : _current_nouts (-1) , _current_nins (-1) + , _current_uri ("") , pan_automation_style_button ("") , pan_automation_state_button ("") , _panner_list() @@ -214,12 +215,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 +242,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; @@ -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; @@ -284,7 +290,7 @@ PannerUI::setup_pan () 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); |