X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_params_ui.cc;h=a8ddc02c1f9bef62c8560dae48620861d670f369;hb=946a99f554a158d569b2cea5310a1197664dcda5;hp=bfa209d81e6c750c10ac777fefdea32be7813707;hpb=f450df300c9c057141a4caf79ff6dbfbf58492d9;p=ardour.git diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index bfa209d81e..a8ddc02c1f 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -18,16 +18,13 @@ */ #include -#define __STDC_FORMAT_MACROS #include -#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" @@ -36,23 +33,22 @@ #include "ardour/return.h" #include "ardour/route.h" #include "ardour/send.h" -#include "ardour/session.h" -#include "ardour/session.h" -#include "ardour/session_route.h" +#include "ardour/internal_send.h" #include "ardour_ui.h" #include "gui_thread.h" #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" #include "route_params_ui.h" #include "send_ui.h" -#include "utils.h" +#include "timers.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; @@ -60,7 +56,7 @@ using namespace Gtk; using namespace Gtkmm2ext; RouteParams_UI::RouteParams_UI () - : ArdourDialog ("track/bus inspector"), + : ArdourWindow (_("Tracks and Busses")), latency_apply_button (Stock::APPLY), track_menu(0) { @@ -93,6 +89,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); @@ -126,24 +124,14 @@ RouteParams_UI::RouteParams_UI () route_vpacker.pack_start (title_label, false, false); route_vpacker.pack_start (route_hpacker, true, true); + list_hpane.add (list_vpacker); + list_hpane.add (route_vpacker); - 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); - + add (list_hpane); 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)); @@ -151,12 +139,8 @@ RouteParams_UI::RouteParams_UI () 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 (sigc::bind (ptr_fun (just_hide_it), - static_cast (_plugin_selector))); - - - signal_delete_event().connect(sigc::bind(ptr_fun(just_hide_it), static_cast(this))); + _plugin_selector = new PluginSelector (PluginManager::instance()); + show_all(); } RouteParams_UI::~RouteParams_UI () @@ -171,7 +155,7 @@ RouteParams_UI::add_routes (RouteList& routes) for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) { boost::shared_ptr route = (*x); - if (route->is_hidden()) { + if (route->is_auditioner()) { return; } @@ -181,18 +165,22 @@ RouteParams_UI::add_routes (RouteList& routes) //route_select_list.rows().back().select (); - route->NameChanged.connect (*this, boost::bind (&RouteParams_UI::route_name_changed, this, boost::weak_ptr(route)), gui_context()); - route->GoingAway.connect (*this, boost::bind (&RouteParams_UI::route_removed, this, boost::weak_ptr(route)), gui_context()); + route->PropertyChanged.connect (*this, invalidator (*this), boost::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::weak_ptr wr) +RouteParams_UI::route_property_changed (const PropertyChange& what_changed, boost::weak_ptr wr) { + if (!what_changed.contains (ARDOUR::Properties::name)) { + return; + } + boost::shared_ptr route (wr.lock()); - if (!route) { + if (!route) { return; } @@ -219,6 +207,25 @@ RouteParams_UI::route_name_changed (boost::weak_ptr wr) } } +void +RouteParams_UI::map_frozen() +{ + ENSURE_GUI_THREAD (*this, &RouteParams_UI::map_frozen) + boost::shared_ptr at = boost::dynamic_pointer_cast(_route); + if (at && insert_box) { + switch (at->freeze_state()) { + case AudioTrack::Frozen: + insert_box->set_sensitive (false); + //hide_redirect_editors (); // TODO hide editor windows + break; + default: + insert_box->set_sensitive (true); + // XXX need some way, maybe, to retoggle redirect editors + break; + } + } +} + void RouteParams_UI::setup_processor_boxes() { @@ -231,9 +238,13 @@ RouteParams_UI::setup_processor_boxes() 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); + boost::shared_ptr at = boost::dynamic_pointer_cast(_route); + if (at) { + at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&RouteParams_UI::map_frozen, this), gui_context()); + } + redir_hpane.add (*insert_box); - insert_box->ProcessorSelected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected)); + insert_box->ProcessorSelected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected)); //note: this indicates a double-click activation, not just a "selection" insert_box->ProcessorUnselected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected)); redir_hpane.show_all(); @@ -257,7 +268,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); } } @@ -275,17 +286,17 @@ RouteParams_UI::cleanup_latency_frame () delete latency_widget; latency_widget = 0; - + } } 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(), AudioEngine::instance()->samples_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); @@ -293,8 +304,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 (); @@ -359,11 +370,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; @@ -391,15 +402,15 @@ RouteParams_UI::route_removed (boost::weak_ptr wr) void RouteParams_UI::set_session (Session *sess) { - ArdourDialog::set_session (sess); - + ArdourWindow::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), boost::bind (&RouteParams_UI::add_routes, this, _1), gui_context()); start_updating (); } else { stop_updating (); @@ -458,8 +469,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), boost::bind (&RouteParams_UI::processors_changed, this, _1), gui_context()); + track_input_label.set_text (_route->name()); update_title(); @@ -484,9 +495,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); @@ -502,9 +512,7 @@ RouteParams_UI::show_track_menu() if (track_menu == 0) { track_menu = new Menu; track_menu->set_name ("ArdourContextMenu"); - track_menu->items().push_back - (MenuElem (_("Add Track/Bus"), - sigc::bind (sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route), (Gtk::Window*) 0))); + track_menu->items().push_back (MenuElem (_("Add Track or Bus"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route))); } track_menu->popup (1, gtk_get_current_event_time()); } @@ -517,15 +525,20 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) boost::shared_ptr plugin_insert; boost::shared_ptr port_insert; - if ((send = boost::dynamic_pointer_cast (proc)) != 0) { + if ((boost::dynamic_pointer_cast (proc)) != 0) { + cleanup_view(); + _processor.reset ((Processor*) 0); + update_title(); + return; + } else if ((send = boost::dynamic_pointer_cast (proc)) != 0) { SendUI *send_ui = new SendUI (this, send, _session); cleanup_view(); - send->GoingAway.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); + redir_hpane.add (*_active_view); redir_hpane.show_all(); } else if ((retrn = boost::dynamic_pointer_cast (proc)) != 0) { @@ -533,10 +546,10 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) ReturnUI *return_ui = new ReturnUI (this, retrn, _session); cleanup_view(); - retrn->GoingAway.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); + redir_hpane.add (*_active_view); redir_hpane.show_all(); } else if ((plugin_insert = boost::dynamic_pointer_cast (proc)) != 0) { @@ -544,11 +557,11 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) GenericPluginUI *plugin_ui = new GenericPluginUI (plugin_insert, true); cleanup_view(); - plugin_insert->plugin()->GoingAway.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; - redir_hpane.pack2 (*_active_view); + redir_hpane.add (*_active_view); redir_hpane.show_all(); } else if ((port_insert = boost::dynamic_pointer_cast (proc)) != 0) { @@ -556,10 +569,10 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) PortInsertUI *portinsert_ui = new PortInsertUI (this, _session, port_insert); cleanup_view(); - port_insert->GoingAway.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); + redir_hpane.add (*_active_view); portinsert_ui->redisplay(); redir_hpane.show_all(); } @@ -604,31 +617,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()); } } @@ -636,7 +633,7 @@ RouteParams_UI::update_title () void RouteParams_UI::start_updating () { - update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect + update_connection = Timers::rapid_connect (sigc::mem_fun(*this, &RouteParams_UI::update_views)); }