X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_channel_selector.cc;h=09dab030407c99b9c244bcb037390aa4cdd78d66;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=20155471af11c5d87edab625d15c65066a238045;hpb=0de7c8920b57e9af99597affb1b18e3435fc1f67;p=ardour.git diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc index 20155471af..09dab03040 100644 --- a/gtk2_ardour/export_channel_selector.cc +++ b/gtk2_ardour/export_channel_selector.cc @@ -18,8 +18,6 @@ */ -#include "export_channel_selector.h" - #include #include "pbd/convert.h" @@ -33,7 +31,10 @@ #include -#include "i18n.h" +#include "export_channel_selector.h" +#include "route_sorter.h" + +#include "pbd/i18n.h" using namespace std; using namespace Glib; @@ -98,6 +99,11 @@ PortExportChannelSelector::sync_with_manager () split_checkbox.set_active (state->config->get_split()); channels_spinbutton.set_value (state->config->get_n_chans()); + /* when loading presets, config is ready set here (shared ptr) + * fill_route_list () -> update_channel_count () -> set_channel_count () -> update_config() + * will call config->clear_channels(); and clear the config + */ + channel_view.set_config (ChannelConfigPtr ()); fill_route_list (); channel_view.set_config (state->config); } @@ -106,7 +112,7 @@ void PortExportChannelSelector::fill_route_list () { channel_view.clear_routes (); - RouteList routes = *_session->get_routes(); + RouteList routes = _session->get_routelist(); /* Add master bus and then everything else */ @@ -115,6 +121,8 @@ PortExportChannelSelector::fill_route_list () channel_view.add_route (master); } + routes.sort (Stripable::Sorter ()); + for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { if ((*it)->is_master () || (*it)->is_monitor ()) { continue; @@ -154,7 +162,7 @@ PortExportChannelSelector::RouteCols::Channel & PortExportChannelSelector::RouteCols::get_channel (uint32_t channel) { if (channel > n_channels) { - std::cout << "Invalid channel cout for get_channel!" << std::endl; + std::cout << "Invalid channel count for get_channel!" << std::endl; } std::list::iterator it = channels.begin(); @@ -179,16 +187,21 @@ PortExportChannelSelector::ChannelTreeView::ChannelTreeView (uint32_t max_channe /* Add column with toggle and text */ - append_column_editable (_("Bus or Track"), route_cols.selected); + append_column_editable (_("Export"), route_cols.selected); Gtk::CellRendererText* text_renderer = Gtk::manage (new Gtk::CellRendererText); text_renderer->property_editable() = false; + text_renderer->set_alignment (0.0, 0.5); - Gtk::TreeView::Column* column = get_column (0); + Gtk::TreeView::Column* column = Gtk::manage (new Gtk::TreeView::Column); + column->set_title (_("Bus or Track")); column->pack_start (*text_renderer); + column->set_expand (true); column->add_attribute (text_renderer->property_text(), route_cols.name); + append_column (*column); Gtk::CellRendererToggle *toggle = dynamic_cast(get_column_cell_renderer (0)); + toggle->set_alignment (0.0, 0.5); toggle->signal_toggled().connect (sigc::mem_fun (*this, &PortExportChannelSelector::ChannelTreeView::update_toggle_selection)); static_columns = get_columns().size(); @@ -204,6 +217,7 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c) if (config == c) { return; } config = c; + if (!config) { return; } uint32_t i = 1; ExportChannelConfiguration::ChannelList chan_list = config->get_channels(); @@ -224,7 +238,7 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c) for (Gtk::ListStore::Children::const_iterator p_it = port_list->children().begin(); p_it != port_list->children().end(); ++p_it) { route_ports.insert ((*p_it)->get_value (route_cols.port_cols.port)); port_labels.insert (make_pair ((*p_it)->get_value (route_cols.port_cols.port), - (*p_it)->get_value (route_cols.port_cols.label))); + (*p_it)->get_value (route_cols.port_cols.label))); } std::set_intersection (pec->get_ports().begin(), pec->get_ports().end(), @@ -315,6 +329,7 @@ PortExportChannelSelector::ChannelTreeView::set_channel_count (uint32_t channels Gtk::CellRendererCombo* combo_renderer = Gtk::manage (new Gtk::CellRendererCombo); combo_renderer->property_text_column() = 2; + combo_renderer->property_has_entry() = false; column->pack_start (*combo_renderer); append_column (*column); @@ -440,15 +455,15 @@ RegionExportChannelSelector::RegionExportChannelSelector (ARDOUR::Session * _ses ProfileManagerPtr manager, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track) : - ExportChannelSelector (_session, manager), - region (region), - track (track), - region_chans (region.n_channels()), - track_chans (track.n_outputs().n_audio()), - - raw_button (type_group), - fades_button (type_group), - processed_button (type_group) + ExportChannelSelector (_session, manager), + region (region), + track (track), + region_chans (region.n_channels()), + track_chans (track.n_outputs().n_audio()), + + raw_button (type_group), + fades_button (type_group), + processed_button (type_group) { pack_start (vbox); @@ -522,7 +537,8 @@ RegionExportChannelSelector::handle_selection () factory.reset (new RegionExportChannelFactory (_session, region, track, type)); state->config->set_region_processing_type (type); - for (size_t chan = 0; chan < region_chans; ++chan) { + const size_t cc = type == RegionExportChannelFactory::Processed ? track_chans : region_chans; + for (size_t chan = 0; chan < cc; ++chan) { state->config->register_channel (factory->create (chan)); } @@ -533,14 +549,18 @@ RegionExportChannelSelector::handle_selection () TrackExportChannelSelector::TrackExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager) : ExportChannelSelector(session, manager) - , region_contents_button(source_group, _("Export region contents")) - , track_output_button(source_group, _("Export track output")) + , track_output_button(_("Apply track/bus processing")) + , select_tracks_button (_("Select all tracks")) + , select_busses_button (_("Select all busses")) + , select_none_button (_("Deselect all")) { pack_start(main_layout); // Options - options_box.pack_start(region_contents_button); options_box.pack_start(track_output_button); + options_box.pack_start (select_tracks_button); + options_box.pack_start (select_busses_button); + options_box.pack_start (select_none_button); main_layout.pack_start(options_box, false, false); // Track scroller @@ -551,20 +571,33 @@ TrackExportChannelSelector::TrackExportChannelSelector (ARDOUR::Session * sessio // Track list track_list = Gtk::ListStore::create (track_cols); + track_list->set_sort_column (track_cols.order_key, Gtk::SORT_ASCENDING); track_view.set_model (track_list); track_view.set_headers_visible (true); - track_view.append_column_editable (_("Track"), track_cols.selected); + track_view.append_column_editable (_("Export"), track_cols.selected); Gtk::CellRendererToggle *toggle = dynamic_cast(track_view.get_column_cell_renderer (0)); + toggle->set_alignment (0.0, 0.5); + toggle->signal_toggled().connect (sigc::hide (sigc::mem_fun (*this, &TrackExportChannelSelector::update_config))); Gtk::CellRendererText* text_renderer = Gtk::manage (new Gtk::CellRendererText); text_renderer->property_editable() = false; + text_renderer->set_alignment (0.0, 0.5); - Gtk::TreeView::Column* column = track_view.get_column (0); - column->pack_start (*text_renderer); + Gtk::TreeView::Column* column = Gtk::manage (new Gtk::TreeView::Column); + column->set_title (_("Track name")); + + track_view.append_column (*column); + column->pack_start (*text_renderer, false); column->add_attribute (text_renderer->property_text(), track_cols.label); + select_tracks_button.signal_clicked().connect (sigc::mem_fun (*this, &TrackExportChannelSelector::select_tracks)); + select_busses_button.signal_clicked().connect (sigc::mem_fun (*this, &TrackExportChannelSelector::select_busses)); + select_none_button.signal_clicked().connect (sigc::mem_fun (*this, &TrackExportChannelSelector::select_none)); + + track_output_button.signal_clicked().connect (sigc::mem_fun (*this, &TrackExportChannelSelector::track_outputs_selected)); + fill_list(); show_all_children (); @@ -577,11 +610,55 @@ TrackExportChannelSelector::sync_with_manager () update_config(); } +void +TrackExportChannelSelector::select_tracks () +{ + for (Gtk::ListStore::Children::iterator it = track_list->children().begin(); it != track_list->children().end(); ++it) { + Gtk::TreeModel::Row row = *it; + boost::shared_ptr route = row[track_cols.route]; + if (boost::dynamic_pointer_cast (route)) { + // it's a track + row[track_cols.selected] = true; + } + } + update_config(); +} + +void +TrackExportChannelSelector::select_busses () +{ + for (Gtk::ListStore::Children::iterator it = track_list->children().begin(); it != track_list->children().end(); ++it) { + Gtk::TreeModel::Row row = *it; + boost::shared_ptr route = row[track_cols.route]; + if (!boost::dynamic_pointer_cast (route)) { + // it's not a track, must be a bus + row[track_cols.selected] = true; + } + } + update_config(); +} + +void +TrackExportChannelSelector::select_none () +{ + for (Gtk::ListStore::Children::iterator it = track_list->children().begin(); it != track_list->children().end(); ++it) { + Gtk::TreeModel::Row row = *it; + row[track_cols.selected] = false; + } + update_config(); +} + +void +TrackExportChannelSelector::track_outputs_selected () +{ + update_config(); +} + void TrackExportChannelSelector::fill_list() { track_list->clear(); - RouteList routes = *_session->get_routes(); + RouteList routes = _session->get_routelist(); for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { if (!boost::dynamic_pointer_cast(*it)) { @@ -589,12 +666,21 @@ TrackExportChannelSelector::fill_list() if ((*it)->is_master () || (*it)->is_monitor ()) { continue; } + if (!(*it)->active ()) { + // don't include inactive busses + continue; + } + // not monitor or master bus add_track (*it); } } for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { if (boost::dynamic_pointer_cast(*it)) { + if (!(*it)->active ()) { + // don't include inactive tracks + continue; + } add_track (*it); } } @@ -606,9 +692,10 @@ TrackExportChannelSelector::add_track (boost::shared_ptr route) Gtk::TreeModel::iterator iter = track_list->append(); Gtk::TreeModel::Row row = *iter; - row[track_cols.selected] = true; + row[track_cols.selected] = false; row[track_cols.label] = route->name(); row[track_cols.route] = route; + row[track_cols.order_key] = route->presentation_info().order(); } void @@ -623,7 +710,7 @@ TrackExportChannelSelector::update_config() continue; } - ExportProfileManager::ChannelConfigStatePtr state = manager->add_channel_config(); + ExportProfileManager::ChannelConfigStatePtr state; boost::shared_ptr route = row[track_cols.route]; @@ -635,16 +722,30 @@ TrackExportChannelSelector::update_config() ExportChannelPtr channel (new PortExportChannel ()); PortExportChannel * pec = static_cast (channel.get()); pec->add_port(port); + if (!state) { + state = manager->add_channel_config(); + } state->config->register_channel(channel); } } } else { std::list list; RouteExportChannel::create_from_route (list, route); + if (list.size () == 0) { + continue; + } + state = manager->add_channel_config(); state->config->register_channels (list); } - state->config->set_name (route->name()); + if (state) { + if (_session->config.get_track_name_number() && route->track_number() > 0) { + state->config->set_name (string_compose ("%1-%2", route->track_number(), route->name())); + } else { + state->config->set_name (route->name()); + } + } + } CriticalSelectionChanged ();