fix peak-thread, GUI-thread race condition

[ardour.git] / gtk2_ardour / route_params_ui.h

diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index a1a9323134fbc2448a62392b4e68262ff67ccbe7..65bef26b5254a2c2aaea49dc41f18f7cdc4a5ac6 100644 (file)
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -37,8 +37,7 @@
 
 #include "ardour/ardour.h"
 
-#include "io_selector.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "processor_box.h"
 #include "route_processor_selection.h"
 #include "latency_gui.h"
@@ -54,8 +53,9 @@ namespace ARDOUR {
 }
 
 class PluginSelector;
+class IOSelector;
 
-class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
+class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
 {
   public:
        RouteParams_UI ();
@@ -63,7 +63,7 @@ class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
 
        void set_session (ARDOUR::Session*);
        void session_going_away ();
-       PluginSelector*  plugin_selector() { return _plugin_selector; }
+       PluginSelector* plugin_selector() { return _plugin_selector; }
 
   private:
        Gtk::HBox                global_hpacker;
@@ -123,13 +123,14 @@ class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
        IOSelector     * _output_iosel;
 
        PluginSelector    *_plugin_selector;
-       RouteRedirectSelection  _rr_selection;
+       RouteProcessorSelection  _rr_selection;
 
        boost::shared_ptr<ARDOUR::Route> _route;
-       boost::signals2::scoped_connection _route_processors_connection;
+       PBD::ScopedConnection _route_processors_connection;
+       PBD::ScopedConnectionList route_connections;
 
        boost::shared_ptr<ARDOUR::Processor> _processor;
-       boost::signals2::scoped_connection _processor_going_away_connection;
+       PBD::ScopedConnection _processor_going_away_connection;
 
 
        enum ConfigView {
@@ -150,7 +151,7 @@ class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
                        add(text);
                        add(route);
                }
-               Gtk::TreeModelColumn<Glib::ustring> text;
+               Gtk::TreeModelColumn<std::string> text;
                Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
        };
 
@@ -161,8 +162,9 @@ class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
 
        void add_routes (ARDOUR::RouteList&);
 
-       void route_name_changed (boost::weak_ptr<ARDOUR::Route> route);
+       void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Route> route);
        void route_removed (boost::weak_ptr<ARDOUR::Route> route);
+       void map_frozen ();
 
 
        void route_selected();