Make stem export export from right before any processors.

The dialog does not support exporting from the outputs anymore, sorry. Will add options later...


git-svn-id: svn://localhost/ardour2/branches/3.0@8520 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 21 insertions, 15 deletions

diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index 6881b032a4..019bb161e7 100644
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -548,20 +548,20 @@ TrackExportChannelSelector::fill_list()
 	for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) {
 		Route * route = it->get();
 		if(dynamic_cast<AudioTrack *>(route)) {
-			add_track(route->output().get());
+			add_track(route);
 		}
 	}
 }
 
 void
-TrackExportChannelSelector::add_track(IO * io)
+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] = io->name();
-	row[track_cols.track] = io;
+	row[track_cols.label] = route->name();
+	row[track_cols.track] = route;
 }
 
 void
@@ -577,8 +577,10 @@ TrackExportChannelSelector::update_config()
 		}
 		
 		ExportProfileManager::ChannelConfigStatePtr state = manager->add_channel_config();
-		
-		IO * track = row[track_cols.track];
+
+		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);
@@ -589,7 +591,11 @@ TrackExportChannelSelector::update_config()
 				state->config->register_channel(channel);
 			}
 		}
-		
+		*/
+
+		std::list<ExportChannelPtr> list;
+		RouteExportChannel::create_from_route (list, *track);
+		state->config->register_channels (list);
 		state->config->set_name(track->name());
 	}
 
diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h
index 63af76e77d..e7b2dc11ee 100644
--- a/gtk2_ardour/export_channel_selector.h
+++ b/gtk2_ardour/export_channel_selector.h
@@ -230,23 +230,23 @@ class TrackExportChannelSelector : public ExportChannelSelector
 {
   public:
 	TrackExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager);
-	
+
 	virtual void sync_with_manager ();
-	
+
   private:
 
 	void fill_list();
-	void add_track(ARDOUR::IO * io);
+	void add_track(ARDOUR::Route * route);
 	void update_config();
-	
+
 	ChannelConfigList configs;
-	
+
 	struct TrackCols : public Gtk::TreeModelColumnRecord
 	{
 	  public:
-		Gtk::TreeModelColumn<ARDOUR::IO *>  track;
-		Gtk::TreeModelColumn<std::string>   label;
-		Gtk::TreeModelColumn<bool>          selected;
+		Gtk::TreeModelColumn<ARDOUR::Route *> track;
+		Gtk::TreeModelColumn<std::string>     label;
+		Gtk::TreeModelColumn<bool>            selected;
 
 		TrackCols () { add (track); add(label); add(selected); }
 	};