delete 'big' 2d panner window, if panner changes to mono|stereo

This commit is contained in:
Robin Gareus 2014-01-13 12:02:00 +01:00
parent 346310c60b
commit 9c595f8131
2 changed files with 7 additions and 4 deletions

View file

@ -202,10 +202,6 @@ Panner2d::handle_state_change ()
{ {
panconnect.drop_connections(); panconnect.drop_connections();
if (!panner_shell->panner()) { if (!panner_shell->panner()) {
/* we should really self-destruct the UI here
* -> * PannerUI::set_panner() -> delete
*/
queue_draw ();
return; return;
} }

View file

@ -231,11 +231,16 @@ PannerUI::setup_pan ()
_mono_panner = 0; _mono_panner = 0;
if (!_panner) { if (!_panner) {
delete big_window;
big_window = 0;
return; return;
} }
if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_2in2out#ui") 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(); boost::shared_ptr<Pannable> pannable = _panner->pannable();
_stereo_panner = new StereoPanner (_panshell); _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" else if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_1in2out#ui"
|| _panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_balance#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<Pannable> pannable = _panner->pannable();
boost::shared_ptr<AutomationControl> ac = pannable->pan_azimuth_control; boost::shared_ptr<AutomationControl> ac = pannable->pan_azimuth_control;