X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_channel_selector.cc;h=9043da31242b3addc8e38211ea4f38c26c51f5a5;hb=e91821bd76b6008d9df6d5086655daa40a19275d;hp=fcebdb003a51f2cf639ac5046fbe2d99e077eefb;hpb=54caccf1598f7d4cc277e0af13dfeb9afc7ed7ce;p=ardour.git diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc index fcebdb003a..9043da3124 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); } @@ -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(); @@ -209,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(); @@ -229,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(), @@ -446,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); @@ -528,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)); } @@ -539,8 +549,7 @@ 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")) @@ -548,7 +557,6 @@ TrackExportChannelSelector::TrackExportChannelSelector (ARDOUR::Session * sessio 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); @@ -588,6 +596,8 @@ TrackExportChannelSelector::TrackExportChannelSelector (ARDOUR::Session * sessio 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 (); @@ -611,6 +621,7 @@ TrackExportChannelSelector::select_tracks () row[track_cols.selected] = true; } } + update_config(); } void @@ -624,6 +635,7 @@ TrackExportChannelSelector::select_busses () row[track_cols.selected] = true; } } + update_config(); } void @@ -633,6 +645,13 @@ TrackExportChannelSelector::select_none () Gtk::TreeModel::Row row = *it; row[track_cols.selected] = false; } + update_config(); +} + +void +TrackExportChannelSelector::track_outputs_selected () +{ + update_config(); } void @@ -676,7 +695,7 @@ TrackExportChannelSelector::add_track (boost::shared_ptr route) row[track_cols.selected] = false; row[track_cols.label] = route->name(); row[track_cols.route] = route; - row[track_cols.order_key] = route->order_key(); + row[track_cols.order_key] = route->presentation_info().order(); } void @@ -691,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]; @@ -703,16 +722,26 @@ 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) { + state->config->set_name (route->name()); + } + } CriticalSelectionChanged ();