From 5396459667a66f44707e535299164c93a5594082 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 7 Feb 2014 17:55:46 +0100 Subject: update available panners when panshell changes Fixes issue when adding splitting plugin --- gtk2_ardour/mixer_strip.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 830d2bf161..db5287f0d0 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1033,6 +1033,7 @@ MixerStrip::connect_to_pan () if (panners._panner == 0) { panners.panshell_changed (); } + update_panner_choices(); } void -- cgit v1.2.3 From 46806c1595afb1ee499a211b7455857b1cd79e33 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 7 Feb 2014 18:05:47 +0100 Subject: panner UI: check URI and #of channels on re-configuration --- gtk2_ardour/panner_ui.cc | 16 +++++++++++----- gtk2_ardour/panner_ui.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 9ea2b357eb..c0c305fae1 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(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); diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h index 9b349d664f..8bf448c7ea 100644 --- a/gtk2_ardour/panner_ui.h +++ b/gtk2_ardour/panner_ui.h @@ -96,6 +96,7 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr bool in_pan_update; int _current_nouts; int _current_nins; + std::string _current_uri; static const int pan_bar_height; -- cgit v1.2.3 From 52bff05a4aab789b7cdbd97714a9b6cac1c2f18c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 7 Feb 2014 19:21:30 +0100 Subject: fix stereo-panner GUI edge case (panshel changes, send|listen) --- gtk2_ardour/stereo_panner.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index d480c60529..2a5f521f1d 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -99,6 +99,7 @@ StereoPanner::StereoPanner (boost::shared_ptr p) width_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); _panner_shell->Changed.connect (panshell_connections, invalidator (*this), boost::bind (&StereoPanner::bypass_handler, this), gui_context()); + _panner_shell->PannableChanged.connect (panshell_connections, invalidator (*this), boost::bind (&StereoPanner::pannable_handler, this), gui_context()); ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler)); -- cgit v1.2.3