window delete/hide is managed by WMProxy (amend to cb6f16ac)

[ardour.git] / gtk2_ardour / route_params_ui.cc

diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index 7e36efff9ba1b98906751e6762f896e05cec09f5..e9ddb54d4149708d4f0b76514175a66289aa5fe5 100644 (file)
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -20,13 +20,11 @@
 #include <algorithm>
 #include <inttypes.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
 
-#include "ardour/ardour.h"
 #include "ardour/audioengine.h"
-#include "ardour/audio_track.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/plugin_manager.h"
@@ -34,9 +32,6 @@
 #include "ardour/return.h"
 #include "ardour/route.h"
 #include "ardour/send.h"
-#include "ardour/session.h"
-#include "ardour/session.h"
-#include "ardour/session_route.h"
 
 #include "ardour_ui.h"
 #include "gui_thread.h"
@@ -59,7 +54,7 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 
 RouteParams_UI::RouteParams_UI ()
-       : ArdourDialog (_("Tracks and Busses")),
+       : ArdourWindow (_("Tracks and Busses")),
          latency_apply_button (Stock::APPLY),
          track_menu(0)
 {
@@ -137,7 +132,7 @@ RouteParams_UI::RouteParams_UI ()
 
        //global_vpacker.pack_start (list_hpane, true, true);
        //get_vbox()->pack_start (global_vpacker);
-       get_vbox()->pack_start (list_hpane);
+       add (list_hpane);
 
 
        set_name ("RouteParamsWindow");
@@ -150,12 +145,7 @@ RouteParams_UI::RouteParams_UI ()
 
        add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_RELEASE_MASK);
 
-       _plugin_selector = new PluginSelector (PluginManager::the_manager());
-       _plugin_selector->signal_delete_event().connect (sigc::bind (ptr_fun (just_hide_it),
-                                                    static_cast<Window *> (_plugin_selector)));
-
-
-       signal_delete_event().connect(sigc::bind(ptr_fun(just_hide_it), static_cast<Gtk::Window *>(this)));
+       _plugin_selector = new PluginSelector (PluginManager::instance());
 }
 
 RouteParams_UI::~RouteParams_UI ()
@@ -170,7 +160,7 @@ RouteParams_UI::add_routes (RouteList& routes)
        for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
                boost::shared_ptr<Route> route = (*x);
 
-               if (route->is_hidden()) {
+               if (route->is_auditioner()) {
                        return;
                }
 
@@ -180,7 +170,7 @@ RouteParams_UI::add_routes (RouteList& routes)
 
                //route_select_list.rows().back().select ();
 
-               route->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RouteParams_UI::route_property_changed, this, _1, boost::weak_ptr<Route>(route)), gui_context());
+               route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RouteParams_UI::route_property_changed, this, _1, boost::weak_ptr<Route>(route)), gui_context());
                route->DropReferences.connect (*this, invalidator (*this), boost::bind (&RouteParams_UI::route_removed, this, boost::weak_ptr<Route>(route)), gui_context());
        }
 }
@@ -394,7 +384,7 @@ RouteParams_UI::route_removed (boost::weak_ptr<Route> wr)
 void
 RouteParams_UI::set_session (Session *sess)
 {
-       ArdourDialog::set_session (sess);
+       ArdourWindow::set_session (sess);
 
        route_display_model->clear();
        _plugin_selector->set_session (_session);
@@ -402,7 +392,7 @@ RouteParams_UI::set_session (Session *sess)
        if (_session) {
                boost::shared_ptr<RouteList> r = _session->get_routes();
                add_routes (*r);
-               _session->RouteAdded.connect (_session_connections, invalidator (*this), ui_bind (&RouteParams_UI::add_routes, this, _1), gui_context());
+               _session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&RouteParams_UI::add_routes, this, _1), gui_context());
                start_updating ();
        } else {
                stop_updating ();
@@ -461,7 +451,7 @@ RouteParams_UI::route_selected()
                setup_processor_boxes();
                setup_latency_frame ();
 
-               route->processors_changed.connect (_route_processors_connection, invalidator (*this), ui_bind (&RouteParams_UI::processors_changed, this, _1), gui_context());
+               route->processors_changed.connect (_route_processors_connection, invalidator (*this), boost::bind (&RouteParams_UI::processors_changed, this, _1), gui_context());
 
                track_input_label.set_text (_route->name());