X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Froute_params_ui.cc;h=64e78c21253e91cbce91a30944bd14bb19b4ea6b;hb=e33d4553b2b333c30835b00741fc5c1fd0e2b36d;hp=245b0019dc483f1d635a95ba0ba6b083e645da0c;hpb=88beef2e93d26d28467fe151f5ef2972d0ca9169;p=ardour.git diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 245b0019dc..64e78c2125 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -58,13 +58,11 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; -using namespace sigc; RouteParams_UI::RouteParams_UI () - : ArdourDialog ("track/bus inspector"), + : ArdourDialog (_("Tracks and Busses")), latency_apply_button (Stock::APPLY), track_menu(0) - { insert_box = 0; _input_iosel = 0; @@ -95,6 +93,8 @@ RouteParams_UI::RouteParams_UI () route_display.set_headers_visible(true); route_display.set_headers_clickable(true); + dynamic_cast(route_display.get_column_cell_renderer(0))->property_ellipsize() = Pango::ELLIPSIZE_START; + route_select_scroller.add(route_display); route_select_scroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); @@ -103,17 +103,17 @@ RouteParams_UI::RouteParams_UI () route_select_frame.add(route_select_scroller); list_vpacker.pack_start (route_select_frame, true, true); - + notebook.pages().push_back (TabElem (input_frame, _("Inputs"))); notebook.pages().push_back (TabElem (output_frame, _("Outputs"))); notebook.pages().push_back (TabElem (redir_hpane, _("Plugins, Inserts & Sends"))); notebook.pages().push_back (TabElem (latency_frame, _("Latency"))); notebook.set_name ("InspectorNotebook"); - + title_label.set_name ("RouteParamsTitleLabel"); update_title(); - + latency_packer.set_spacing (18); latency_button_box.pack_start (latency_apply_button); delay_label.set_alignment (0, 0.5); @@ -121,47 +121,42 @@ RouteParams_UI::RouteParams_UI () // changeable area route_param_frame.set_name("RouteParamsBaseFrame"); route_param_frame.set_shadow_type (Gtk::SHADOW_IN); - - + + route_hpacker.pack_start (notebook, true, true); - + route_vpacker.pack_start (title_label, false, false); route_vpacker.pack_start (route_hpacker, true, true); - + list_hpane.pack1 (list_vpacker); list_hpane.add2 (route_vpacker); list_hpane.set_position(110); redir_hpane.set_position(110); - + //global_vpacker.pack_start (list_hpane, true, true); //get_vbox()->pack_start (global_vpacker); get_vbox()->pack_start (list_hpane); - - + + set_name ("RouteParamsWindow"); set_default_size (620,370); 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)); + route_display.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &RouteParams_UI::route_selected)); + route_display.get_column(0)->signal_clicked().connect(sigc::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->signal_delete_event().connect (bind (ptr_fun (just_hide_it), + _plugin_selector->signal_delete_event().connect (sigc::bind (ptr_fun (just_hide_it), static_cast (_plugin_selector))); - signal_delete_event().connect(bind(ptr_fun(just_hide_it), static_cast(this))); + signal_delete_event().connect(sigc::bind(ptr_fun(just_hide_it), static_cast(this))); } RouteParams_UI::~RouteParams_UI () @@ -171,31 +166,41 @@ RouteParams_UI::~RouteParams_UI () void RouteParams_UI::add_routes (RouteList& routes) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::add_routes), routes)); - + ENSURE_GUI_THREAD (*this, &RouteParams_UI::add_routes, routes) + for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) { boost::shared_ptr route = (*x); if (route->is_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->NameChanged.connect (bind (mem_fun(*this, &RouteParams_UI::route_name_changed), route)); - route->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::route_removed), route)); + + route->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RouteParams_UI::route_property_changed, this, _1, boost::weak_ptr(route)), gui_context()); + route->DropReferences.connect (*this, invalidator (*this), boost::bind (&RouteParams_UI::route_removed, this, boost::weak_ptr(route)), gui_context()); } } void -RouteParams_UI::route_name_changed (boost::shared_ptr route) +RouteParams_UI::route_property_changed (const PropertyChange& what_changed, boost::weak_ptr wr) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::route_name_changed), route)); + if (!what_changed.contains (ARDOUR::Properties::name)) { + return; + } + + boost::shared_ptr route (wr.lock()); + + if (!route) { + return; + } + + ENSURE_GUI_THREAD (*this, &RouteParams_UI::route_name_changed, wr) bool found = false ; TreeModel::Children rows = route_display_model->children(); @@ -221,19 +226,19 @@ RouteParams_UI::route_name_changed (boost::shared_ptr route) void RouteParams_UI::setup_processor_boxes() { - if (session && _route) { + if (_session && _route) { // just in case... shouldn't need this cleanup_processor_boxes(); - + // construct new redirect boxes - insert_box = new ProcessorBox(*session, *_plugin_selector, _rr_selection, 0); - insert_box->set_route (_route); + insert_box = new ProcessorBox (_session, boost::bind (&RouteParams_UI::plugin_selector, this), _rr_selection, 0); + insert_box->set_route (_route); - redir_hpane.pack1 (*insert_box); + redir_hpane.pack1 (*insert_box); - insert_box->ProcessorSelected.connect (mem_fun(*this, &RouteParams_UI::redirect_selected)); - insert_box->ProcessorUnselected.connect (mem_fun(*this, &RouteParams_UI::redirect_selected)); + insert_box->ProcessorSelected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected)); + insert_box->ProcessorUnselected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected)); redir_hpane.show_all(); } @@ -269,18 +274,19 @@ RouteParams_UI::cleanup_latency_frame () latency_packer.remove (*latency_widget); latency_packer.remove (latency_button_box); latency_packer.remove (delay_label); + latency_connections.drop_connections (); + latency_click_connection.disconnect (); + delete latency_widget; latency_widget = 0; - latency_conn.disconnect (); - delay_conn.disconnect (); - latency_apply_conn.disconnect (); + } } void RouteParams_UI::setup_latency_frame () { - latency_widget = new LatencyGUI (*(_route->output()), session->frame_rate(), session->engine().frames_per_cycle()); + latency_widget = new LatencyGUI (*(_route->output()), _session->frame_rate(), _session->engine().frames_per_cycle()); char buf[128]; snprintf (buf, sizeof (buf), _("Playback delay: %u samples"), _route->initial_delay()); @@ -290,10 +296,10 @@ RouteParams_UI::setup_latency_frame () latency_packer.pack_start (latency_button_box, false, false); latency_packer.pack_start (delay_label); - latency_apply_conn = latency_apply_button.signal_clicked().connect (mem_fun (*latency_widget, &LatencyGUI::finish)); - latency_conn = _route->signal_latency_changed.connect (mem_fun (*this, &RouteParams_UI::refresh_latency)); - delay_conn = _route->initial_delay_changed.connect (mem_fun (*this, &RouteParams_UI::refresh_latency)); - + latency_click_connection = latency_apply_button.signal_clicked().connect (sigc::mem_fun (*latency_widget, &LatencyGUI::finish)); + _route->signal_latency_changed.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context()); + _route->initial_delay_changed.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context()); + latency_frame.add (latency_packer); latency_frame.show_all (); } @@ -302,15 +308,15 @@ void RouteParams_UI::setup_io_frames() { cleanup_io_frames(); - + // input - _input_iosel = new IOSelector (*session, _route->input()); + _input_iosel = new IOSelector (this, _session, _route->input()); _input_iosel->setup (); input_frame.add (*_input_iosel); input_frame.show_all(); - + // output - _output_iosel = new IOSelector (*session, _route->output()); + _output_iosel = new IOSelector (this, _session, _route->output()); _output_iosel->setup (); output_frame.add (*_output_iosel); output_frame.show_all(); @@ -340,12 +346,12 @@ RouteParams_UI::cleanup_view (bool stopupdate) { if (_active_view) { GenericPluginUI * plugui = 0; - + if (stopupdate && (plugui = dynamic_cast(_active_view)) != 0) { plugui->stop_updating (0); } - _plugin_conn.disconnect(); + _processor_going_away_connection.disconnect (); redir_hpane.remove(*_active_view); delete _active_view; _active_view = 0; @@ -353,9 +359,15 @@ RouteParams_UI::cleanup_view (bool stopupdate) } void -RouteParams_UI::route_removed (boost::shared_ptr route) +RouteParams_UI::route_removed (boost::weak_ptr wr) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::route_removed), route)); + boost::shared_ptr route (wr.lock()); + + if (!route) { + return; + } + + ENSURE_GUI_THREAD (*this, invalidator (*this), &RouteParams_UI::route_removed, wr) TreeModel::Children rows = route_display_model->children(); TreeModel::Children::iterator ri; @@ -373,7 +385,7 @@ RouteParams_UI::route_removed (boost::shared_ptr route) cleanup_io_frames(); cleanup_view(); cleanup_processor_boxes(); - + _route.reset ((Route*) 0); _processor.reset ((Processor*) 0); update_title(); @@ -384,29 +396,27 @@ void RouteParams_UI::set_session (Session *sess) { ArdourDialog::set_session (sess); - + route_display_model->clear(); + _plugin_selector->set_session (_session); - if (session) { - boost::shared_ptr r = session->get_routes(); + if (_session) { + boost::shared_ptr 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)); + _session->RouteAdded.connect (_session_connections, invalidator (*this), ui_bind (&RouteParams_UI::add_routes, this, _1), gui_context()); start_updating (); } else { stop_updating (); } - - //route_select_list.thaw (); - - _plugin_selector->set_session (session); -} +} void -RouteParams_UI::session_gone () +RouteParams_UI::session_going_away () { - ENSURE_GUI_THREAD(mem_fun(*this, &RouteParams_UI::session_gone)); + ENSURE_GUI_THREAD (*this, &RouteParams_UI::session_going_away); + + SessionHandlePtr::session_going_away (); route_display_model->clear(); @@ -418,9 +428,6 @@ RouteParams_UI::session_gone () _route.reset ((Route*) 0); _processor.reset ((Processor*) 0); update_title(); - - ArdourDialog::session_gone(); - } void @@ -440,8 +447,7 @@ RouteParams_UI::route_selected() // remove event binding from previously selected if (_route) { - _route_conn.disconnect(); - _route_ds_conn.disconnect(); + _route_processors_connection.disconnect (); cleanup_processor_boxes(); cleanup_view(); cleanup_io_frames(); @@ -456,9 +462,8 @@ RouteParams_UI::route_selected() setup_processor_boxes(); setup_latency_frame (); - // bind to redirects changed event for this route - _route_conn = route->processors_changed.connect (mem_fun(*this, &RouteParams_UI::processors_changed)); - + route->processors_changed.connect (_route_processors_connection, invalidator (*this), ui_bind (&RouteParams_UI::processors_changed, this, _1), gui_context()); + track_input_label.set_text (_route->name()); update_title(); @@ -466,7 +471,7 @@ RouteParams_UI::route_selected() } else { // no selection if (_route) { - _route_conn.disconnect(); + _route_processors_connection.disconnect (); // remove from view cleanup_io_frames(); @@ -483,11 +488,11 @@ RouteParams_UI::route_selected() } void -RouteParams_UI::processors_changed () +RouteParams_UI::processors_changed (RouteProcessorChange c) { - ENSURE_GUI_THREAD(mem_fun(*this, &RouteParams_UI::processors_changed)); + ENSURE_GUI_THREAD (*this, &RouteParams_UI::processors_changed, c) cleanup_view(); - + _processor.reset ((Processor*) 0); //update_title(); @@ -497,87 +502,82 @@ void RouteParams_UI::show_track_menu() { using namespace Menu_Helpers; - + if (track_menu == 0) { track_menu = new Menu; track_menu->set_name ("ArdourContextMenu"); - track_menu->items().push_back - (MenuElem (_("Add Track/Bus"), - bind (mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route), (Gtk::Window*) 0))); + track_menu->items().push_back + (MenuElem (_("Add Track or Bus"), + sigc::bind (sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route), (Gtk::Window*) 0))); } track_menu->popup (1, gtk_get_current_event_time()); } void -RouteParams_UI::redirect_selected (boost::shared_ptr insert) +RouteParams_UI::redirect_selected (boost::shared_ptr proc) { - Placement place = PreFader; - boost::shared_ptr send; boost::shared_ptr retrn; boost::shared_ptr plugin_insert; boost::shared_ptr port_insert; - - if ((send = boost::dynamic_pointer_cast (insert)) != 0) { - SendUI *send_ui = new SendUI (send, *session); + if ((send = boost::dynamic_pointer_cast (proc)) != 0) { + + SendUI *send_ui = new SendUI (this, send, _session); cleanup_view(); - _plugin_conn = send->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), - insert)); + send->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr(proc)), gui_context()); _active_view = send_ui; - + redir_hpane.add2 (*_active_view); redir_hpane.show_all(); - } else if ((retrn = boost::dynamic_pointer_cast (insert)) != 0) { + } else if ((retrn = boost::dynamic_pointer_cast (proc)) != 0) { - ReturnUI *return_ui = new ReturnUI (retrn, *session); + ReturnUI *return_ui = new ReturnUI (this, retrn, _session); cleanup_view(); - _plugin_conn = retrn->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), - insert)); + retrn->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr(proc)), gui_context()); _active_view = return_ui; - + redir_hpane.add2 (*_active_view); redir_hpane.show_all(); - } else if ((plugin_insert = boost::dynamic_pointer_cast (insert)) != 0) { + } else if ((plugin_insert = boost::dynamic_pointer_cast (proc)) != 0) { GenericPluginUI *plugin_ui = new GenericPluginUI (plugin_insert, true); cleanup_view(); - _plugin_conn = plugin_insert->plugin()->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), - PreFader)); + plugin_insert->plugin()->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::plugin_going_away, this, PreFader), gui_context()); plugin_ui->start_updating (0); _active_view = plugin_ui; + redir_hpane.pack2 (*_active_view); redir_hpane.show_all(); - } else if ((port_insert = boost::dynamic_pointer_cast (insert)) != 0) { + } else if ((port_insert = boost::dynamic_pointer_cast (proc)) != 0) { + + PortInsertUI *portinsert_ui = new PortInsertUI (this, _session, port_insert); - PortInsertUI *portinsert_ui = new PortInsertUI (*session, port_insert); - cleanup_view(); - _plugin_conn = port_insert->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), - insert)); + port_insert->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr (proc)), gui_context()); _active_view = portinsert_ui; + redir_hpane.pack2 (*_active_view); portinsert_ui->redisplay(); redir_hpane.show_all(); } - - _processor = insert; - + + _processor = proc; update_title(); - + } void RouteParams_UI::plugin_going_away (Placement place) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), place)); - + ENSURE_GUI_THREAD (*this, &RouteParams_UI::plugin_going_away, place) + // delete the current view without calling finish if (place == PreFader) { @@ -587,57 +587,45 @@ RouteParams_UI::plugin_going_away (Placement place) } void -RouteParams_UI::redirect_going_away (boost::shared_ptr insert) - +RouteParams_UI::processor_going_away (boost::weak_ptr wproc) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), insert)); - + boost::shared_ptr proc = (wproc.lock()); + + if (!proc) { + return; + } + + ENSURE_GUI_THREAD (*this, &RouteParams_UI::processor_going_away, wproc) + printf ("redirect going away\n"); // delete the current view without calling finish - if (insert == _processor) { + if (proc == _processor) { cleanup_view (false); _processor.reset ((Processor*) 0); - } + } } void RouteParams_UI::update_title () { - WindowTitle title(Glib::get_application_name()); - title += _("Track/Bus Inspector"); + WindowTitle title (_("Tracks and Busses")); 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 += _route->name(); - set_title(title.get_string()); - } - else { - title_label.set_text(_("No Route Selected")); - title += _("No Route Selected"); + } else { + title_label.set_text(_("No Track or Bus Selected")); + title += _("No Track or Bus Selected"); set_title(title.get_string()); - } + } } void RouteParams_UI::start_updating () { - update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect - (mem_fun(*this, &RouteParams_UI::update_views)); + update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect + (sigc::mem_fun(*this, &RouteParams_UI::update_views)); } void @@ -651,7 +639,7 @@ RouteParams_UI::update_views () { SendUI *sui; // TODO: only do it if correct tab is showing - + if ((sui = dynamic_cast (_active_view)) != 0) { sui->update (); }