correct check for presence of / or \ in a session name

[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 93496920c11a03993517490d2c269a267c2c8669..d1a79de8afbda689bc542c7ce27231a17f9d3399 100644 (file)
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -22,6 +22,7 @@
 #include <glibmm/thread.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/stop_signal.h>
+#include <gtkmm2ext/window_title.h>
 
 #include <ardour/session.h>
 #include <ardour/session_route.h>
@@ -53,11 +54,11 @@
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
+using namespace Gtkmm2ext;
 using namespace sigc;
 
-RouteParams_UI::RouteParams_UI (AudioEngine& eng)
+RouteParams_UI::RouteParams_UI ()
        : ArdourDialog ("track/bus inspector"),
-         engine (eng),
          track_menu(0)
 {
        pre_redirect_box = 0;
@@ -136,9 +137,12 @@ RouteParams_UI::RouteParams_UI (AudioEngine& eng)
        
        set_name ("RouteParamsWindow");
        set_default_size (620,370);
-       set_title (_("ardour: track/bus inspector"));
        set_wmclass (X_("ardour_route_parameters"), "Ardour");
 
+       WindowTitle title(Glib::get_application_name());
+       title += _("Track/Bus Inspector"); 
+       set_title (title.get_string());
+
        // events
        route_display.get_selection()->signal_changed().connect(mem_fun(*this, &RouteParams_UI::route_selected));
        route_display.get_column(0)->signal_clicked().connect(mem_fun(*this, &RouteParams_UI::show_track_menu));
@@ -216,8 +220,11 @@ RouteParams_UI::setup_redirect_boxes()
                cleanup_redirect_boxes();
                
                // construct new redirect boxes
-               pre_redirect_box = new RedirectBox(PreFader, *session, _route, *_plugin_selector, _rr_selection);
-               post_redirect_box = new RedirectBox(PostFader, *session, _route, *_plugin_selector, _rr_selection);
+               pre_redirect_box = new RedirectBox(PreFader, *session, *_plugin_selector, _rr_selection);
+               post_redirect_box = new RedirectBox(PostFader, *session, *_plugin_selector, _rr_selection);
+
+               pre_redirect_box->set_route (_route);
+               post_redirect_box->set_route (_route);
 
                pre_redir_hpane.pack1 (*pre_redirect_box);
                post_redir_hpane.pack1 (*post_redirect_box);
@@ -290,9 +297,9 @@ void
 RouteParams_UI::cleanup_pre_view (bool stopupdate)
 {
        if (_active_pre_view) {
-               LadspaPluginUI *   plugui = 0;
+               GenericPluginUI *   plugui = 0;
                
-               if (stopupdate && (plugui = dynamic_cast<LadspaPluginUI*>(_active_pre_view)) != 0) {
+               if (stopupdate && (plugui = dynamic_cast<GenericPluginUI*>(_active_pre_view)) != 0) {
                          plugui->stop_updating (0);
                }
 
@@ -307,9 +314,9 @@ void
 RouteParams_UI::cleanup_post_view (bool stopupdate)
 {
        if (_active_post_view) {
-               LadspaPluginUI *   plugui = 0;
+               GenericPluginUI *   plugui = 0;
                
-               if (stopupdate && (plugui = dynamic_cast<LadspaPluginUI*>(_active_post_view)) != 0) {
+               if (stopupdate && (plugui = dynamic_cast<GenericPluginUI*>(_active_post_view)) != 0) {
                          plugui->stop_updating (0);
                }
                _post_plugin_conn.disconnect();
@@ -507,7 +514,7 @@ RouteParams_UI::show_track_menu()
                track_menu->set_name ("ArdourContextMenu");
                track_menu->items().push_back 
                                (MenuElem (_("Add Track/Bus"), 
-                                          mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route)));
+                                          bind (mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route), (Gtk::Window*) 0)));
        }
        track_menu->popup (1, gtk_get_current_event_time());
 }
@@ -560,7 +567,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Redirect> redirect,
                                
                if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (insert)) != 0) {                                
 
-                       LadspaPluginUI *plugin_ui = new LadspaPluginUI (plugin_insert, true);
+                       GenericPluginUI *plugin_ui = new GenericPluginUI (plugin_insert, true);
 
                        if (place == PreFader) {
                                cleanup_pre_view();
@@ -651,29 +658,33 @@ RouteParams_UI::redirect_going_away (boost::shared_ptr<ARDOUR::Redirect> redirec
 void
 RouteParams_UI::update_title ()
 {
-       if (_route) {
-               string title;
-               title += _route->name();
-//             title += ": ";
-
-//             if (_redirect && (_current_view == PLUGIN_CONFIG_VIEW || _current_view == SEND_CONFIG_VIEW)) {
-//                     title += _redirect->name();
-//             }
-//             else if (_current_view == INPUT_CONFIG_VIEW) {
-//                     title += _("INPUT");
-//             }
-//             else if (_current_view == OUTPUT_CONFIG_VIEW) {
-//                     title += _("OUTPUT");
-//             }
+       WindowTitle title(Glib::get_application_name());
+       title += _("Track/Bus Inspector");
+
+       if (_route) {
+
+               //              title += ": ";
+
+               //              if (_redirect && (_current_view == PLUGIN_CONFIG_VIEW || _current_view == SEND_CONFIG_VIEW)) {
+               //                      title += _redirect->name();
+               //              }
+               //              else if (_current_view == INPUT_CONFIG_VIEW) {
+               //                      title += _("INPUT");
+               //              }
+               //              else if (_current_view == OUTPUT_CONFIG_VIEW) {
+               //                      title += _("OUTPUT");
+               //              }
+
+               title_label.set_text(_route->name());
                
-               title_label.set_text(title);
+               title += _route->name();
 
-               title = _("ardour: track/bus inspector: ") + title;
-               set_title(title);
+               set_title(title.get_string());
        }
        else {
                title_label.set_text(_("No Route Selected"));
-               set_title(_("ardour: track/bus/inspector: no route selected"));
+               title += _("No Route Selected");
+               set_title(title.get_string());
        }       
 }