X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fexport_channel_selector.cc;h=6cf73d22966a53362665208b8c6e267fe7c4f4e4;hb=5b45dc04dfba73846893a8c591c4175c20b3415f;hp=8df698e8539a4e244cc6ac06f49b404a123f2b54;hpb=3f30e8093e1c78bb722196ecb48d9c7cbdd279c3;p=ardour.git diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc index 8df698e853..6cf73d2296 100644 --- a/gtk2_ardour/export_channel_selector.cc +++ b/gtk2_ardour/export_channel_selector.cc @@ -117,7 +117,7 @@ PortExportChannelSelector::fill_route_list () channel_view.add_route (master); for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { - if ((*it)->output().get() == master) { + if ((*it)->is_master () || (*it)->is_monitor ()) { continue; } channel_view.add_route ((*it)->output().get()); @@ -218,21 +218,21 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c) } Glib::RefPtr port_list = r_it->get_value (route_cols.port_list_col); - std::set route_ports; - std::set intersection; - std::map port_labels; + std::set > route_ports; + std::set > intersection; + std::map, string> port_labels; 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 (std::pair ((*p_it)->get_value (route_cols.port_cols.port), - (*p_it)->get_value (route_cols.port_cols.label))); + port_labels.insert (make_pair ((*p_it)->get_value (route_cols.port_cols.port), + (*p_it)->get_value (route_cols.port_cols.label))); } std::set_intersection (pec->get_ports().begin(), pec->get_ports().end(), route_ports.begin(), route_ports.end(), - std::insert_iterator > (intersection, intersection.begin())); + std::insert_iterator > > (intersection, intersection.begin())); - intersection.erase (0); // Remove "none" selection + intersection.erase (boost::weak_ptr ()); // Remove "none" selection if (intersection.empty()) { continue; @@ -244,13 +244,13 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c) /* Set previous channels (if any) to none */ for (uint32_t chn = 1; chn < i; ++chn) { - r_it->set_value (route_cols.get_channel (chn).port, (AudioPort *) 0); + r_it->set_value (route_cols.get_channel (chn).port, boost::weak_ptr ()); r_it->set_value (route_cols.get_channel (chn).label, string ("(none)")); } } - AudioPort * port = *intersection.begin(); - std::map::iterator label_it = port_labels.find (port); + boost::weak_ptr port = *intersection.begin(); + std::map, string>::iterator label_it = port_labels.find (port); string label = label_it != port_labels.end() ? label_it->second : "error"; r_it->set_value (route_cols.get_channel (i).port, port); @@ -294,7 +294,7 @@ PortExportChannelSelector::ChannelTreeView::add_route (ARDOUR::IO * io) row = *iter; row[route_cols.port_cols.selected] = false; - row[route_cols.port_cols.port] = 0; + row[route_cols.port_cols.port] = boost::weak_ptr (); row[route_cols.port_cols.label] = "(none)"; } @@ -331,7 +331,7 @@ PortExportChannelSelector::ChannelTreeView::set_channel_count (uint32_t channels for (Gtk::ListStore::Children::iterator it = route_list->children().begin(); it != route_list->children().end(); ++it) { std::string label = it->get_value(route_cols.selected) ? "(none)" : ""; it->set_value (route_cols.get_channel (n_channels).label, label); - it->set_value (route_cols.get_channel (n_channels).port, (AudioPort *) 0); + it->set_value (route_cols.get_channel (n_channels).port, boost::weak_ptr ()); } /* set column width */ @@ -355,7 +355,6 @@ PortExportChannelSelector::ChannelTreeView::set_channel_count (uint32_t channels void PortExportChannelSelector::ChannelTreeView::update_config () { - if (!config) { return; } config->clear_channels(); @@ -372,7 +371,8 @@ PortExportChannelSelector::ChannelTreeView::update_config () continue; } - AudioPort * port = row[route_cols.get_channel (i).port]; + boost::weak_ptr weak_port = row[route_cols.get_channel (i).port]; + boost::shared_ptr port = weak_port.lock (); if (port) { pec->add_port (port); } @@ -398,7 +398,7 @@ PortExportChannelSelector::ChannelTreeView::update_toggle_selection (std::string } iter->set_value (route_cols.get_channel (i).label, std::string("(none)")); - iter->set_value (route_cols.get_channel (i).port, (AudioPort *) 0); + iter->set_value (route_cols.get_channel (i).port, boost::weak_ptr ()); Glib::RefPtr port_list = iter->get_value (route_cols.port_list_col); Gtk::ListStore::Children::iterator port_it; @@ -407,7 +407,7 @@ PortExportChannelSelector::ChannelTreeView::update_toggle_selection (std::string for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) { if (port_number == i) { iter->set_value (route_cols.get_channel (i).label, (std::string) (*port_it)->get_value (route_cols.port_cols.label)); - iter->set_value (route_cols.get_channel (i).port, (AudioPort *) (*port_it)->get_value (route_cols.port_cols.port)); + iter->set_value (route_cols.get_channel (i).port, (*port_it)->get_value (route_cols.port_cols.port)); } ++port_number; @@ -429,7 +429,8 @@ PortExportChannelSelector::ChannelTreeView::update_selection_text (std::string c for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) { std::string label = port_it->get_value (route_cols.port_cols.label); if (label == new_text) { - iter->set_value (route_cols.get_channel (channel).port, (AudioPort *) (*port_it)[route_cols.port_cols.port]); + boost::weak_ptr w = (*port_it)[route_cols.port_cols.port]; + iter->set_value (route_cols.get_channel (channel).port, w); } } @@ -502,3 +503,102 @@ RegionExportChannelSelector::handle_selection () CriticalSelectionChanged (); } + +TrackExportChannelSelector::TrackExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager) + : ExportChannelSelector(session, manager) +{ + track_scroller.add (track_view); + track_scroller.set_size_request (-1, 130); + track_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + pack_start(track_scroller); + + // Track list + track_list = Gtk::ListStore::create (track_cols); + track_view.set_model (track_list); + track_view.set_headers_visible (true); + + track_view.append_column_editable (_("Track"), track_cols.selected); + Gtk::CellRendererToggle *toggle = dynamic_cast(track_view.get_column_cell_renderer (0)); + 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; + + Gtk::TreeView::Column* column = track_view.get_column (0); + column->pack_start (*text_renderer); + column->add_attribute (text_renderer->property_text(), track_cols.label); + + fill_list(); + + show_all_children (); +} + +void +TrackExportChannelSelector::sync_with_manager () +{ + // TODO implement properly + update_config(); +} + +void +TrackExportChannelSelector::fill_list() +{ + track_list->clear(); + RouteList routes = *_session->get_routes(); + + for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { + Route * route = it->get(); + if(dynamic_cast(route)) { + add_track(route); + } + } +} + +void +TrackExportChannelSelector::add_track(Route * route) +{ + Gtk::TreeModel::iterator iter = track_list->append(); + Gtk::TreeModel::Row row = *iter; + + row[track_cols.selected] = true; + row[track_cols.label] = route->name(); + row[track_cols.track] = route; +} + +void +TrackExportChannelSelector::update_config() +{ + manager->clear_channel_configs(); + + for (Gtk::ListStore::Children::iterator it = track_list->children().begin(); it != track_list->children().end(); ++it) { + Gtk::TreeModel::Row row = *it; + + if (!row[track_cols.selected]) { + continue; + } + + ExportProfileManager::ChannelConfigStatePtr state = manager->add_channel_config(); + + Route * track = row[track_cols.track]; + + /* Output of track code. TODO make this an option also + uint32_t outs = track->n_ports().n_audio(); + for (uint32_t i = 0; i < outs; ++i) { + AudioPort * port = track->audio (i); + if(port) { + ExportChannelPtr channel (new PortExportChannel ()); + PortExportChannel * pec = static_cast (channel.get()); + pec->add_port(port); + state->config->register_channel(channel); + } + } + */ + + std::list list; + RouteExportChannel::create_from_route (list, *track); + state->config->register_channels (list); + state->config->set_name(track->name()); + } + + CriticalSelectionChanged (); +}