mechanism to allow Track (or other Route-derived type) to add its own processors...

[ardour.git] / gtk2_ardour / ardour_dialog.cc

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 99722d426fcd518563bba4d1409400d71622e837..1c9da0112f1439bf4e50e737fab033607f0a52d2 100644 (file)
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -52,6 +52,34 @@ ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool
 }
 
 ArdourDialog::~ArdourDialog ()
+{
+       pop_splash ();
+       Keyboard::the_keyboard().focus_out_window (0, this);
+       WM::Manager::instance().remove (proxy);
+}
+
+void
+ArdourDialog::on_response (int response_id)
+{
+       pop_splash ();
+       hide ();
+       ARDOUR::GUIIdle ();
+       Gtk::Dialog::on_response (response_id);
+}
+
+void
+ArdourDialog::close_self ()
+{
+       /* Don't call Idle, don't pop splash.
+        * This is used at exit and session-close and invoked
+        * via close_all_dialogs.
+        */
+       hide ();
+       Gtk::Dialog::on_response (RESPONSE_CANCEL);
+}
+
+void
+ArdourDialog::pop_splash ()
 {
        if (_splash_pushed) {
                Splash* spl = Splash::instance();
@@ -59,9 +87,8 @@ ArdourDialog::~ArdourDialog ()
                if (spl) {
                        spl->pop_front();
                }
+               _splash_pushed = false;
        }
-       Keyboard::the_keyboard().focus_out_window (0, this);
-       WM::Manager::instance().remove (proxy);
 }
 
 bool
@@ -122,7 +149,7 @@ ArdourDialog::init ()
                set_transient_for (*parent);
        }
 
-       ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
+       ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourDialog::close_self)); /* send a RESPONSE_CANCEL to self */
 
        proxy = new WM::ProxyTemporary (get_title(), this);
        WM::Manager::instance().register_window (proxy);