correct check for presence of / or \ in a session name
[ardour.git] / gtk2_ardour / route_params_ui.cc
index ef24cb9fa613ec8ba7d21ba98e09a6f1fd571a18..d1a79de8afbda689bc542c7ce27231a17f9d3399 100644 (file)
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <algorithm>
 
-#include <pbd/lockmonitor.h>
+#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>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 #include <ardour/plugin.h>
 #include <ardour/plugin_manager.h>
 #include <ardour/ardour.h>
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
+using namespace Gtkmm2ext;
 using namespace sigc;
 
-static const gchar *route_display_titles[] = { N_("Tracks/Buses"), 0 };
-static const gchar *pre_display_titles[] = { N_("Pre Redirects"), 0 };
-static const gchar *post_display_titles[] = { N_("Post Redirects"), 0 };
-
-RouteParams_UI::RouteParams_UI (AudioEngine& eng)
+RouteParams_UI::RouteParams_UI ()
        : ArdourDialog ("track/bus inspector"),
-         engine (eng),
-         route_select_list (internationalize(route_display_titles)),
-         _route(0), 
          track_menu(0)
 {
        pre_redirect_box = 0;
        post_redirect_box = 0;
-       _route = 0;
-       _pre_redirect = 0;
-       _post_redirect = 0;
        _input_iosel = 0;
        _output_iosel = 0;
        _active_pre_view = 0;
@@ -78,21 +70,29 @@ RouteParams_UI::RouteParams_UI (AudioEngine& eng)
        
        using namespace Notebook_Helpers;
 
-       input_frame.set_shadow_type(GTK_SHADOW_NONE);
-       output_frame.set_shadow_type(GTK_SHADOW_NONE);
+       input_frame.set_shadow_type(Gtk::SHADOW_NONE);
+       output_frame.set_shadow_type(Gtk::SHADOW_NONE);
        
        notebook.set_show_tabs (true);
        notebook.set_show_border (true);
        notebook.set_name ("RouteParamNotebook");
-       
-       route_select_list.column_titles_active();
-       route_select_list.set_name ("RouteParamsListDisplay");
-       route_select_list.set_shadow_type (Gtk::SHADOW_IN);
-       route_select_list.set_selection_mode (GTK_SELECTION_SINGLE);
-       route_select_list.set_reorderable (false);
-       route_select_list.set_size_request (75, -1);
-       route_select_scroller.add (route_select_list);
-       route_select_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+
+       // create the tree model
+       route_display_model = ListStore::create(route_display_columns);
+
+       // setup the treeview
+       route_display.set_model(route_display_model);
+       route_display.append_column(_("Tracks/Buses"), route_display_columns.text);
+       route_display.set_name(X_("RouteParamsListDisplay"));
+       route_display.get_selection()->set_mode(Gtk::SELECTION_SINGLE); // default
+       route_display.set_reorderable(false);
+       route_display.set_size_request(75, -1);
+       route_display.set_headers_visible(true);
+       route_display.set_headers_clickable(true);
+
+       route_select_scroller.add(route_display);
+       route_select_scroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+
 
        route_select_frame.set_name("RouteSelectBaseFrame");
        route_select_frame.set_shadow_type (Gtk::SHADOW_IN);
@@ -122,7 +122,7 @@ RouteParams_UI::RouteParams_UI (AudioEngine& eng)
        route_vpacker.pack_start (route_hpacker, true, true);
 
        
-       list_hpane.add1 (list_vpacker);
+       list_hpane.pack1 (list_vpacker);
        list_hpane.add2 (route_vpacker);
 
        list_hpane.set_position(110);
@@ -130,28 +130,31 @@ RouteParams_UI::RouteParams_UI (AudioEngine& eng)
        pre_redir_hpane.set_position(110);
        post_redir_hpane.set_position(110);
        
-       global_vpacker.pack_start (list_hpane, true, true);
+       //global_vpacker.pack_start (list_hpane, true, true);
+       //get_vbox()->pack_start (global_vpacker);
+       get_vbox()->pack_start (list_hpane);
+       
        
-       add (global_vpacker);
        set_name ("RouteParamsWindow");
        set_default_size (620,370);
-       set_title (_("ardour: track/bus inspector"));
-       set_wmclass (_("ardour_route_parameters"), "Ardour");
+       set_wmclass (X_("ardour_route_parameters"), "Ardour");
 
-       // events
-       route_select_list.select_row.connect (mem_fun(*this, &RouteParams_UI::route_selected));
-       route_select_list.unselect_row.connect (mem_fun(*this, &RouteParams_UI::route_unselected));
-       route_select_list.click_column.connect (mem_fun(*this, &RouteParams_UI::show_track_menu));
+       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));
 
        add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_RELEASE_MASK);
        
        _plugin_selector = new PluginSelector (PluginManager::the_manager());
-       _plugin_selector->delete_event.connect (bind (ptr_fun (just_hide_it), 
+       _plugin_selector->signal_delete_event().connect (bind (ptr_fun (just_hide_it), 
                                                     static_cast<Window *> (_plugin_selector)));
 
 
-       delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Gtk::Window*> (this)));
+       signal_delete_event().connect(bind(ptr_fun(just_hide_it), static_cast<Gtk::Window *>(this)));
 }
 
 RouteParams_UI::~RouteParams_UI ()
@@ -159,38 +162,48 @@ RouteParams_UI::~RouteParams_UI ()
 }
 
 void
-RouteParams_UI::add_route (Route* route)
+RouteParams_UI::add_routes (Session::RouteList& routes)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::add_route), route));
+       ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::add_routes), routes));
        
-       if (route->hidden()) {
-               return;
-       }
+       for (Session::RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
+               boost::shared_ptr<Route> route = (*x);
 
-       const gchar *rowdata[1];
-       rowdata[0] = route->name().c_str();
-       route_select_list.rows().push_back (rowdata);
-       route_select_list.rows().back().set_data (route);
-       //route_select_list.rows().back().select ();
-       
-       route->name_changed.connect (bind (mem_fun(*this, &RouteParams_UI::route_name_changed), route));
-       route->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::route_removed), route));
+               if (route->hidden()) {
+                       return;
+               }
+               
+               TreeModel::Row row = *(route_display_model->append());
+               row[route_display_columns.text] = route->name();
+               row[route_display_columns.route] = route;
+               
+               //route_select_list.rows().back().select ();
+               
+               route->name_changed.connect (bind (mem_fun(*this, &RouteParams_UI::route_name_changed), route));
+               route->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::route_removed), route));
+       }
 }
 
 
 void
-RouteParams_UI::route_name_changed (void *src, Route *route)
+RouteParams_UI::route_name_changed (void *src, boost::shared_ptr<Route> route)
 {
        ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::route_name_changed), src, route));
-       
-       CList_Helpers::RowList::iterator i;
 
-       if ((i = route_select_list.rows().find_data (route)) == route_select_list.rows().end()) {
-               error << _("route display list item for renamed route not found!") << endmsg;
-               return;
+       bool found = false ;
+       TreeModel::Children rows = route_display_model->children();
+       for(TreeModel::Children::iterator iter = rows.begin(); iter != rows.end(); ++iter) {
+               boost::shared_ptr<Route> r =(*iter)[route_display_columns.route];
+               if (r == route) {
+                       (*iter)[route_display_columns.text] = route->name() ;
+                       found = true ;
+                       break;
+               }
        }
 
-       route_select_list.cell ((*i)->get_row_num(), 0).set_text (route->name());
+       if(!found) {
+               error << _("route display list item for renamed route not found!") << endmsg;
+       }
 
        if (route == _route) {
                track_input_label.set_text (route->name());
@@ -207,22 +220,22 @@ 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_title (pre_display_titles[0]);
-               pre_redirect_box->set_title_shown (true);
-               post_redirect_box->set_title (post_display_titles[0]);
-               post_redirect_box->set_title_shown (true);
+               pre_redirect_box->set_route (_route);
+               post_redirect_box->set_route (_route);
 
-               pre_redir_hpane.add1 (*pre_redirect_box);
-               post_redir_hpane.add1 (*post_redirect_box);
+               pre_redir_hpane.pack1 (*pre_redirect_box);
+               post_redir_hpane.pack1 (*post_redirect_box);
 
                pre_redirect_box->RedirectSelected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PreFader));
                pre_redirect_box->RedirectUnselected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PreFader));
                post_redirect_box->RedirectSelected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PostFader));
                post_redirect_box->RedirectUnselected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PostFader));
-               
+
+               pre_redir_hpane.show_all();
+               post_redir_hpane.show_all();
        }
        
 }
@@ -249,13 +262,13 @@ RouteParams_UI::setup_io_frames()
        cleanup_io_frames();
        
        // input
-       _input_iosel = new IOSelector (*session, *_route, true);
+       _input_iosel = new IOSelector (*session, _route, true);
        _input_iosel->redisplay ();
         input_frame.add (*_input_iosel);
        input_frame.show_all();
        
        // output
-       _output_iosel = new IOSelector (*session, *_route, false);
+       _output_iosel = new IOSelector (*session, _route, false);
        _output_iosel->redisplay ();
         output_frame.add (*_output_iosel);
        output_frame.show_all();
@@ -284,9 +297,9 @@ void
 RouteParams_UI::cleanup_pre_view (bool stopupdate)
 {
        if (_active_pre_view) {
-               PluginUI *   plugui = 0;
+               GenericPluginUI *   plugui = 0;
                
-               if (stopupdate && (plugui = dynamic_cast<PluginUI*>(_active_pre_view)) != 0) {
+               if (stopupdate && (plugui = dynamic_cast<GenericPluginUI*>(_active_pre_view)) != 0) {
                          plugui->stop_updating (0);
                }
 
@@ -301,9 +314,9 @@ void
 RouteParams_UI::cleanup_post_view (bool stopupdate)
 {
        if (_active_post_view) {
-               PluginUI *   plugui = 0;
+               GenericPluginUI *   plugui = 0;
                
-               if (stopupdate && (plugui = dynamic_cast<PluginUI*>(_active_post_view)) != 0) {
+               if (stopupdate && (plugui = dynamic_cast<GenericPluginUI*>(_active_post_view)) != 0) {
                          plugui->stop_updating (0);
                }
                _post_plugin_conn.disconnect();
@@ -315,38 +328,33 @@ RouteParams_UI::cleanup_post_view (bool stopupdate)
 
 
 void
-RouteParams_UI::route_removed (Route *route)
+RouteParams_UI::route_removed (boost::shared_ptr<Route> route)
 {
        ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::route_removed), route));
-       /*
-       route_select_list.freeze ();
-       route_select_list.clear ();
-       session->foreach_route (this, &RouteParams_UI::add_route);
-       route_select_list.thaw ();
-       */
-       
-       CList_Helpers::RowList::iterator i;
-       
-       if ((i = route_select_list.rows().find_data (route)) == route_select_list.rows().end()) {
-               // couldn't find route to be deleted
-               return;
+
+       TreeModel::Children rows = route_display_model->children();
+       TreeModel::Children::iterator ri;
+
+       for(TreeModel::Children::iterator iter = rows.begin(); iter != rows.end(); ++iter) {
+               boost::shared_ptr<Route> r =(*iter)[route_display_columns.route];
+
+               if (r == route) {
+                       route_display_model->erase(iter);
+                       break;
+               }
        }
 
-       if (route == _route)
-       {
+       if (route == _route) {
                cleanup_io_frames();
                cleanup_pre_view();
                cleanup_post_view();
                cleanup_redirect_boxes();
                
-               _route = 0;
-               _pre_redirect = 0;
-               _post_redirect = 0;
+               _route.reset ((Route*) 0);
+               _pre_redirect.reset ((Redirect*) 0);
+               _post_redirect.reset ((Redirect*) 0);
                update_title();
        }
-
-       route_select_list.rows().erase(i);
-       
 }
 
 void
@@ -354,19 +362,19 @@ RouteParams_UI::set_session (Session *sess)
 {
        ArdourDialog::set_session (sess);
 
-       route_select_list.freeze ();
-       route_select_list.clear ();
+       route_display_model->clear();
 
        if (session) {
-               session->foreach_route (this, &RouteParams_UI::add_route);
-               session->going_away.connect (mem_fun(*this, &ArdourDialog::session_gone));
-               session->RouteAdded.connect (mem_fun(*this, &RouteParams_UI::add_route));
+               boost::shared_ptr<Session::RouteList> r = session->get_routes();
+               add_routes (*r);
+               session->GoingAway.connect (mem_fun(*this, &ArdourDialog::session_gone));
+               session->RouteAdded.connect (mem_fun(*this, &RouteParams_UI::add_routes));
                start_updating ();
        } else {
                stop_updating ();
        }
 
-       route_select_list.thaw ();
+       //route_select_list.thaw ();
 
        _plugin_selector->set_session (session);
 }      
@@ -375,17 +383,18 @@ RouteParams_UI::set_session (Session *sess)
 void
 RouteParams_UI::session_gone ()
 {
+       ENSURE_GUI_THREAD(mem_fun(*this, &RouteParams_UI::session_gone));
 
-       route_select_list.clear ();
+       route_display_model->clear();
 
        cleanup_io_frames();
        cleanup_pre_view();
        cleanup_post_view();
        cleanup_redirect_boxes();
 
-       _route = 0;
-       _pre_redirect = 0;
-       _post_redirect = 0;
+       _route.reset ((Route*) 0);
+       _pre_redirect.reset ((Redirect*) 0);
+       _post_redirect.reset ((Redirect*) 0);
        update_title();
 
        ArdourDialog::session_gone();
@@ -393,17 +402,19 @@ RouteParams_UI::session_gone ()
 }
 
 void
-RouteParams_UI::route_selected (gint row, gint col, GdkEvent *ev)
+RouteParams_UI::route_selected()
 {
-       Route *route;
-
-       if ((route = (Route *) route_select_list.get_row_data (row)) != 0) {
+       Glib::RefPtr<TreeSelection> selection = route_display.get_selection();
+       TreeModel::iterator iter = selection->get_selected(); // only used with Gtk::SELECTION_SINGLE
+       if(iter) {
+               //If anything is selected
+               boost::shared_ptr<Route> route = (*iter)[route_display_columns.route] ;
 
                if (_route == route) {
                        // do nothing
                        return;
                }
-               
+
                // remove event binding from previously selected
                if (_route) {
                        _route_conn.disconnect();
@@ -413,42 +424,59 @@ RouteParams_UI::route_selected (gint row, gint col, GdkEvent *ev)
                        cleanup_post_view();
                        cleanup_io_frames();
                }
-       
+
                // update the other panes with the correct info
                _route = route;
                //update_routeinfo (route);
 
                setup_io_frames();
                setup_redirect_boxes();
-               
+
                // bind to redirects changed event for this route
                _route_conn = route->redirects_changed.connect (mem_fun(*this, &RouteParams_UI::redirects_changed));
 
                track_input_label.set_text (_route->name());
-               
+
                update_title();
+       } else {
+               // no selection
+               if (_route) {
+                       _route_conn.disconnect();
+
+                       // remove from view
+                       cleanup_io_frames();
+                       cleanup_pre_view();
+                       cleanup_post_view();
+                       cleanup_redirect_boxes();
+
+                       _route.reset ((Route*) 0);
+                       _pre_redirect.reset ((Redirect*) 0);
+                       _post_redirect.reset ((Redirect *) 0);
+                       track_input_label.set_text(_("NO TRACK"));
+                       update_title();
+               }
        }
 }
 
-void
-RouteParams_UI::route_unselected (gint row, gint col, GdkEvent *ev)
-{
-       if (_route) {
-               _route_conn.disconnect();
+//void
+//RouteParams_UI::route_unselected (gint row, gint col, GdkEvent *ev)
+//{
+//     if (_route) {
+//             _route_conn.disconnect();
 
                // remove from view
-               cleanup_io_frames();
-               cleanup_pre_view();
-               cleanup_post_view();
-               cleanup_redirect_boxes();
+//             cleanup_io_frames();
+//             cleanup_pre_view();
+//             cleanup_post_view();
+//             cleanup_redirect_boxes();
                
-               _route = 0;
-               _pre_redirect = 0;
-               _post_redirect = 0;
-               track_input_label.set_text(_("NO TRACK"));
-               update_title();
-       }
-}
+//             _route.reset ((Route*)0);
+//             _pre_redirect = 0;
+//             _post_redirect = 0;
+//             track_input_label.set_text(_("NO TRACK"));
+//             update_title();
+//     }
+//}
 
 void
 RouteParams_UI::redirects_changed (void *src)
@@ -469,15 +497,15 @@ RouteParams_UI::redirects_changed (void *src)
        cleanup_pre_view();
        cleanup_post_view();
        
-       _pre_redirect = 0;
-       _post_redirect = 0;
+       _pre_redirect.reset ((Redirect*) 0);
+       _post_redirect.reset ((Redirect*) 0);
        //update_title();
 }
 
 
 
 void
-RouteParams_UI::show_track_menu (gint arg)
+RouteParams_UI::show_track_menu()
 {
        using namespace Menu_Helpers;
        
@@ -486,36 +514,36 @@ RouteParams_UI::show_track_menu (gint arg)
                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, 0);
+       track_menu->popup (1, gtk_get_current_event_time());
 }
 
 
 
 void
-RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement place)
+RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Redirect> redirect, ARDOUR::Placement place)
 {
-       Insert *insert;
+       boost::shared_ptr<Insert> insert;
 
        if ((place == PreFader && _pre_redirect == redirect)
            || (place == PostFader && _post_redirect == redirect)){
                return;
        }
        
-       if ((insert = dynamic_cast<Insert *> (redirect)) == 0) {
-
-               Send *send;
+       if ((insert = boost::dynamic_pointer_cast<Insert> (redirect)) == 0) {
 
-               if ((send = dynamic_cast<Send *> (redirect)) != 0) {
+               boost::shared_ptr<Send> send;
+               
+               if ((send = boost::dynamic_pointer_cast<Send> (redirect)) != 0) {
 
                        /* its a send */
 
-                       SendUI *send_ui = new SendUI (*send, *session);
+                       SendUI *send_ui = new SendUI (send, *session);
 
                        if (place == PreFader) {
                                cleanup_pre_view();
-                               _pre_plugin_conn = send->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
+                               _pre_plugin_conn = send->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), redirect));
                                _active_pre_view = send_ui;
                                
                                pre_redir_hpane.add2 (*_active_pre_view);
@@ -523,7 +551,7 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
                        }
                        else {
                                cleanup_post_view();
-                               _post_plugin_conn = send->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
+                               _post_plugin_conn = send->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), redirect));
                                _active_post_view = send_ui;
                                
                                post_redir_hpane.add2 (*_active_post_view);
@@ -534,47 +562,47 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
        } else {
                /* its an insert, though we don't know what kind yet. */
 
-               PluginInsert *plugin_insert;
-               PortInsert *port_insert;
+               boost::shared_ptr<PluginInsert> plugin_insert;
+               boost::shared_ptr<PortInsert> port_insert;
                                
-               if ((plugin_insert = dynamic_cast<PluginInsert *> (insert)) != 0) {                             
+               if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (insert)) != 0) {                                
 
-                       PluginUI *plugin_ui = new PluginUI (session->engine(), *plugin_insert, true);
+                       GenericPluginUI *plugin_ui = new GenericPluginUI (plugin_insert, true);
 
                        if (place == PreFader) {
                                cleanup_pre_view();
-                               _pre_plugin_conn = plugin_insert->plugin().GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), PreFader));
+                               _pre_plugin_conn = plugin_insert->plugin()->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), PreFader));
                                plugin_ui->start_updating (0);
                                _active_pre_view = plugin_ui;
-                               pre_redir_hpane.add2 (*_active_pre_view);
+                               pre_redir_hpane.pack2 (*_active_pre_view);
                                pre_redir_hpane.show_all();
                        }
                        else {
                                cleanup_post_view();
-                               _post_plugin_conn = plugin_insert->plugin().GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), PostFader));
+                               _post_plugin_conn = plugin_insert->plugin()->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), PostFader));
                                plugin_ui->start_updating (0);
                                _active_post_view = plugin_ui;
-                               post_redir_hpane.add2 (*_active_post_view);
+                               post_redir_hpane.pack2 (*_active_post_view);
                                post_redir_hpane.show_all();
                        }
 
-               } else if ((port_insert = dynamic_cast<PortInsert *> (insert)) != 0) {
+               } else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (insert)) != 0) {
 
-                       PortInsertUI *portinsert_ui = new PortInsertUI (*session, *port_insert);
+                       PortInsertUI *portinsert_ui = new PortInsertUI (*session, port_insert);
                                        
                        if (place == PreFader) {
                                cleanup_pre_view();
-                               _pre_plugin_conn = port_insert->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
+                               _pre_plugin_conn = port_insert->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), redirect));
                                _active_pre_view = portinsert_ui;
-                               pre_redir_hpane.add2 (*_active_pre_view);
+                               pre_redir_hpane.pack2 (*_active_pre_view);
                                portinsert_ui->redisplay();
                                pre_redir_hpane.show_all();
                        }
                        else {
                                cleanup_post_view();
-                               _post_plugin_conn = port_insert->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
+                               _post_plugin_conn = port_insert->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), redirect));
                                _active_post_view = portinsert_ui;
-                               post_redir_hpane.add2 (*_active_post_view);
+                               post_redir_hpane.pack2 (*_active_post_view);
                                portinsert_ui->redisplay();
                                post_redir_hpane.show_all();
                        }
@@ -584,8 +612,7 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
 
        if (place == PreFader) {
                _pre_redirect = redirect;
-       }
-       else {
+       } else {
                _post_redirect = redirect;
        }
        
@@ -594,54 +621,36 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
 }
 
 void
-RouteParams_UI::redirect_unselected (ARDOUR::Redirect *redirect)
+RouteParams_UI::plugin_going_away (Placement place)
 {
-       // not called anymore
-       
-       if (redirect == _pre_redirect) {
-               cleanup_pre_view();
-               _pre_redirect = 0;
-       }
-       else if (redirect == _post_redirect) {
-               cleanup_post_view();
-               _post_redirect = 0;
-       }
-}
-
-
-
-void
-RouteParams_UI::plugin_going_away (Plugin *plugin, Placement place)
-{
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), plugin, place));
+       ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), place));
        
        // delete the current view without calling finish
 
        if (place == PreFader) {
                cleanup_pre_view (false);
-               _pre_redirect = 0;
+               _pre_redirect.reset ((Redirect*) 0);
        }
        else {
                cleanup_post_view (false);
-               _post_redirect = 0;
+               _post_redirect.reset ((Redirect*) 0);
        }
 }
 
 void
-RouteParams_UI::redirect_going_away (ARDOUR::Redirect *plugin)
+RouteParams_UI::redirect_going_away (boost::shared_ptr<ARDOUR::Redirect> redirect)
 
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), plugin));
+       ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), redirect));
        
        printf ("redirect going away\n");
        // delete the current view without calling finish
-       if (plugin == _pre_redirect) {
+       if (redirect == _pre_redirect) {
                cleanup_pre_view (false);
-               _pre_redirect = 0;
-       }
-       else if (plugin == _post_redirect) {
+               _pre_redirect.reset ((Redirect*) 0);
+       } else if (redirect == _post_redirect) {
                cleanup_post_view (false);
-               _post_redirect = 0;
+               _post_redirect.reset ((Redirect*) 0);
        }
 }
 
@@ -649,29 +658,33 @@ RouteParams_UI::redirect_going_away (ARDOUR::Redirect *plugin)
 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());
        }       
 }