X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_params_ui.cc;h=7e36efff9ba1b98906751e6762f896e05cec09f5;hb=cca8b8cda0d25459019bb10a59616fec108b825e;hp=5378ab8c99106883e79f4aa56863ce95e457b542;hpb=45ff98fcc3b7a30639704985722be998685beaad;p=ardour.git diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 5378ab8c99..7e36efff9b 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -18,16 +18,14 @@ */ #include -#define __STDC_FORMAT_MACROS #include #include #include -#include #include #include "ardour/ardour.h" -#include "ardour/audio_diskstream.h" +#include "ardour/audioengine.h" #include "ardour/audio_track.h" #include "ardour/plugin.h" #include "ardour/plugin_insert.h" @@ -45,6 +43,7 @@ #include "io_selector.h" #include "keyboard.h" #include "mixer_strip.h" +#include "port_insert_ui.h" #include "plugin_selector.h" #include "plugin_ui.h" #include "return_ui.h" @@ -60,7 +59,7 @@ using namespace Gtk; using namespace Gtkmm2ext; RouteParams_UI::RouteParams_UI () - : ArdourDialog ("track/bus inspector"), + : ArdourDialog (_("Tracks and Busses")), latency_apply_button (Stock::APPLY), track_menu(0) { @@ -143,9 +142,7 @@ RouteParams_UI::RouteParams_UI () set_name ("RouteParamsWindow"); set_default_size (620,370); - set_wmclass (X_("ardour_route_parameters"), "Ardour"); - - set_title (_("Track/Bus Inspector")); + set_wmclass (X_("ardour_route_parameters"), PROGRAM_NAME); // events route_display.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &RouteParams_UI::route_selected)); @@ -183,8 +180,8 @@ RouteParams_UI::add_routes (RouteList& routes) //route_select_list.rows().back().select (); - route->PropertyChanged.connect (*this, ui_bind (&RouteParams_UI::route_property_changed, this, _1, boost::weak_ptr(route)), gui_context()); - route->DropReferences.connect (*this, boost::bind (&RouteParams_UI::route_removed, this, boost::weak_ptr(route)), gui_context()); + 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()); } } @@ -198,7 +195,7 @@ RouteParams_UI::route_property_changed (const PropertyChange& what_changed, boos boost::shared_ptr route (wr.lock()); - if (!route) { + if (!route) { return; } @@ -263,7 +260,7 @@ RouteParams_UI::refresh_latency () latency_widget->refresh(); char buf[128]; - snprintf (buf, sizeof (buf), _("Playback delay: %u samples"), _route->initial_delay()); + snprintf (buf, sizeof (buf), _("Playback delay: %" PRId64 " samples"), _route->initial_delay()); delay_label.set_text (buf); } } @@ -281,7 +278,7 @@ RouteParams_UI::cleanup_latency_frame () delete latency_widget; latency_widget = 0; - + } } @@ -291,7 +288,7 @@ RouteParams_UI::setup_latency_frame () 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()); + snprintf (buf, sizeof (buf), _("Playback delay: %" PRId64 " samples"), _route->initial_delay()); delay_label.set_text (buf); latency_packer.pack_start (*latency_widget, false, false); @@ -299,8 +296,8 @@ RouteParams_UI::setup_latency_frame () latency_packer.pack_start (delay_label); latency_click_connection = latency_apply_button.signal_clicked().connect (sigc::mem_fun (*latency_widget, &LatencyGUI::finish)); - _route->signal_latency_changed.connect (latency_connections, boost::bind (&RouteParams_UI::refresh_latency, this), gui_context()); - _route->initial_delay_changed.connect (latency_connections, boost::bind (&RouteParams_UI::refresh_latency, this), gui_context()); + _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 (); @@ -365,11 +362,11 @@ RouteParams_UI::route_removed (boost::weak_ptr wr) { boost::shared_ptr route (wr.lock()); - if (!route) { + if (!route) { return; } - ENSURE_GUI_THREAD (*this, &RouteParams_UI::route_removed, wr) + ENSURE_GUI_THREAD (*this, invalidator (*this), &RouteParams_UI::route_removed, wr) TreeModel::Children rows = route_display_model->children(); TreeModel::Children::iterator ri; @@ -398,14 +395,14 @@ 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(); add_routes (*r); - _session->RouteAdded.connect (_session_connections, ui_bind (&RouteParams_UI::add_routes, this, _1), gui_context()); + _session->RouteAdded.connect (_session_connections, invalidator (*this), ui_bind (&RouteParams_UI::add_routes, this, _1), gui_context()); start_updating (); } else { stop_updating (); @@ -464,8 +461,8 @@ RouteParams_UI::route_selected() setup_processor_boxes(); setup_latency_frame (); - route->processors_changed.connect (_route_processors_connection, ui_bind (&RouteParams_UI::processors_changed, this, _1), gui_context()); - + 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(); @@ -490,9 +487,8 @@ RouteParams_UI::route_selected() } void -RouteParams_UI::processors_changed (RouteProcessorChange c) +RouteParams_UI::processors_changed (RouteProcessorChange) { - ENSURE_GUI_THREAD (*this, &RouteParams_UI::processors_changed, c) cleanup_view(); _processor.reset ((Processor*) 0); @@ -509,7 +505,7 @@ RouteParams_UI::show_track_menu() track_menu = new Menu; track_menu->set_name ("ArdourContextMenu"); track_menu->items().push_back - (MenuElem (_("Add Track/Bus"), + (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()); @@ -528,7 +524,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) SendUI *send_ui = new SendUI (this, send, _session); cleanup_view(); - send->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr(proc)), gui_context()); + 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); @@ -539,7 +535,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) ReturnUI *return_ui = new ReturnUI (this, retrn, _session); cleanup_view(); - retrn->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr(proc)), gui_context()); + 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); @@ -550,7 +546,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) GenericPluginUI *plugin_ui = new GenericPluginUI (plugin_insert, true); cleanup_view(); - plugin_insert->plugin()->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::plugin_going_away, this, PreFader), gui_context()); + 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; @@ -562,7 +558,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) PortInsertUI *portinsert_ui = new PortInsertUI (this, _session, port_insert); cleanup_view(); - port_insert->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr (proc)), gui_context()); + 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); @@ -610,31 +606,15 @@ RouteParams_UI::processor_going_away (boost::weak_ptr wproc) void RouteParams_UI::update_title () { - WindowTitle 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()); } }