X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_export_audio.cc;h=ac0c3f67c4456eb86fd01b8c9977c1fe8efcaeb2;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=59109c508eac545a8575614386b45c418a982b33;hpb=8b68ed57ec5c075261639435be3290c3ba8177eb;p=ardour.git

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 59109c508e..ac0c3f67c4 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -25,27 +25,31 @@
 
 #include <gtkmm/messagedialog.h>
 
-#include "export_dialog.h"
-#include "editor.h"
-#include "public_editor.h"
-#include "selection.h"
-#include "time_axis_view.h"
-#include "audio_time_axis.h"
-#include "audio_region_view.h"
-#include "midi_region_view.h"
+#include "gtkmm2ext/choice.h"
 
 #include "pbd/pthread_utils.h"
-#include "ardour/types.h"
+
+#include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audiofilesource.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/audioregion.h"
+#include "ardour/audiofilesource.h"
 #include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
 #include "ardour/chan_count.h"
+#include "ardour/midi_region.h"
+#include "ardour/session.h"
 #include "ardour/session_directory.h"
 #include "ardour/source_factory.h"
-#include "ardour/audiofilesource.h"
-#include "ardour/session.h"
+#include "ardour/types.h"
+
+#include "audio_region_view.h"
+#include "audio_time_axis.h"
+#include "editor.h"
+#include "export_dialog.h"
+#include "midi_region_view.h"
+#include "public_editor.h"
+#include "selection.h"
+#include "time_axis_view.h"
 
 #include "i18n.h"
 
@@ -57,7 +61,15 @@ using namespace Gtk;
 void
 Editor::export_audio ()
 {
-	ExportDialog dialog (*this, _("Export"));
+	ExportDialog dialog (*this, _("Export"), X_("ExportProfile"));
+	dialog.set_session (_session);
+	dialog.run();
+}
+
+void
+Editor::stem_export ()
+{
+	StemExportDialog dialog (*this);
 	dialog.set_session (_session);
 	dialog.run();
 }
@@ -135,22 +147,27 @@ Editor::write_region_selection (RegionSelection& regions)
 }
 
 void
-Editor::bounce_region_selection ()
+Editor::bounce_region_selection (bool with_processing)
 {
+	/* no need to check for bounceable() because this operation never puts
+	 * its results back in the playlist (only in the region list).
+	 */
+
 	for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
 
 		boost::shared_ptr<Region> region ((*i)->region());
 		RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&(*i)->get_time_axis_view());
-		Track* track = dynamic_cast<Track*>(rtv->route().get());
+		boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (rtv->route());
 
 		InterThreadInfo itt;
 
-		boost::shared_ptr<Region> r = track->bounce_range (region->position(), region->position() + region->length(), itt);
-		cerr << "Result of bounce of "
-		     << region->name() << " len = " << region->length()
-		     << " was "
-		     << r->name() << " len = " << r->length()
-		     << endl;
+		boost::shared_ptr<Region> r;
+
+		if (with_processing) {
+			r = track->bounce_range (region->position(), region->position() + region->length(), itt, track->main_outs(), false);
+		} else {
+			r = track->bounce_range (region->position(), region->position() + region->length(), itt, boost::shared_ptr<Processor>(), false);
+		}
 	}
 }
 
@@ -195,7 +212,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 
 				path = s;
 
-				if (::access (path.c_str(), F_OK) != 0) {
+				if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
 					break;
 				}
 			}
@@ -334,7 +351,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 					  legalize_for_path(playlist.name()).c_str(), cnt, n);
 			}
 
-			if (::access (s, F_OK) != 0) {
+			if (!Glib::file_test (s, Glib::FILE_TEST_EXISTS)) {
 				break;
 			}
 		}