* Some Export GUI tweaks

* Export region with fades
* Removed some debug output


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

1 files changed, 16 insertions, 14 deletions

diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index e26d05d7c8..f01a029c0c 100644
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -440,15 +440,20 @@ RegionExportChannelSelector::RegionExportChannelSelector (ARDOUR::AudioRegion co
   track_chans (track.n_outputs().n_audio()),
 
   raw_button (type_group),
+  fades_button (type_group),
   processed_button (type_group)
 {
 	pack_start (vbox);
 
-	raw_button.set_label (string_compose (_("Raw region export, no fades or plugins (%1 channels)"), region_chans));
+	raw_button.set_label (string_compose (_("Region contents without fades (channels: %1)"), region_chans));
 	raw_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
 	vbox.pack_start (raw_button);
 	
-	processed_button.set_label (string_compose (_("Processed region export with fades and plugins applied (%1 channels)"), track_chans));
+	fades_button.set_label (string_compose (_("Region contents with fades (channels: %1)"), region_chans));
+	fades_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
+	vbox.pack_start (fades_button);
+	
+	processed_button.set_label (string_compose (_("Track output (channels: %1)"), track_chans));
 	processed_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
 	vbox.pack_start (processed_button);
 	
@@ -475,21 +480,18 @@ RegionExportChannelSelector::handle_selection ()
 	state->config->clear_channels ();
 	
 	if (raw_button.get_active ()) {
-	
 		factory.reset (new RegionExportChannelFactory (session, region, track, RegionExportChannelFactory::Raw));
-		
-		for (size_t chan = 0; chan < region_chans; ++chan) {
-			state->config->register_channel (factory->create (chan));
-		}
-		
+	} else if (fades_button.get_active ()) {
+		factory.reset (new RegionExportChannelFactory (session, region, track, RegionExportChannelFactory::Fades));
 	} else if (processed_button.get_active ()) {
-	
 		factory.reset (new RegionExportChannelFactory(session, region, track, RegionExportChannelFactory::Processed));
-		
-		for (size_t chan = 0; chan < region_chans; ++chan) {
-			state->config->register_channel (factory->create (chan));
-		}
-		
+	} else {
+		CriticalSelectionChanged ();
+		return;
+	}
+	
+	for (size_t chan = 0; chan < region_chans; ++chan) {
+		state->config->register_channel (factory->create (chan));
 	}
 	
 	CriticalSelectionChanged ();