X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_export_audio.cc;h=2bd607f10871a9a833aced746997eed9b4bccb61;hb=a5ae129a066747901ff1ed95368729b63cb6a70d;hp=9521f6a0c676be686a814236e35b1d2fec3c5163;hpb=e0d0735fa2c2543c6995e9128dbd16c799f4ec8f;p=ardour.git

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 9521f6a0c6..2bd607f108 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -25,14 +25,14 @@
 
 #include <gtkmm/messagedialog.h>
 
+#include "pbd/gstdio_compat.h"
+
 #include "gtkmm2ext/choice.h"
 
 #include "pbd/pthread_utils.h"
 
-#include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audiofilesource.h"
-#include "ardour/audiofilesource.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
 #include "ardour/chan_count.h"
@@ -51,6 +51,7 @@
 #include "public_editor.h"
 #include "selection.h"
 #include "time_axis_view.h"
+#include "utils.h"
 
 #include "i18n.h"
 
@@ -62,7 +63,7 @@ using namespace Gtk;
 void
 Editor::export_audio ()
 {
-	ExportDialog dialog (*this, _("Export"), X_("ExportProfile"));
+	ExportDialog dialog (*this, _("Export"), ExportProfileManager::RegularExport);
 	dialog.set_session (_session);
 	dialog.run();
 }
@@ -86,11 +87,11 @@ Editor::export_selection ()
 void
 Editor::export_range ()
 {
-	Marker* marker;
+	ArdourMarker* marker;
 
-	if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+	if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
 		fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-		/*NOTREACHED*/
+		abort(); /*NOTREACHED*/
 	}
 
 	Location* l;
@@ -103,6 +104,32 @@ Editor::export_range ()
 	}
 }
 
+bool
+Editor::process_midi_export_dialog (MidiExportDialog& dialog, boost::shared_ptr<MidiRegion> midi_region)
+{
+	string path = dialog.get_path ();
+
+	if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
+		bool overwrite = ARDOUR_UI_UTILS::overwrite_file_dialog (dialog,
+									 _("Confirm MIDI File Overwrite"),
+									 _("A file with the same name already exists. Do you want to overwrite it?"));
+
+		if (!overwrite) {
+			return false;
+		}
+
+		/* force ::g_unlink because the backend code will
+		   go wrong if it tries to open an existing
+		   file for writing.
+		*/
+		::g_unlink (path.c_str());
+	}
+
+	(void) midi_region->clone (path);
+
+	return true;
+}
+
 /** Export the first selected region */
 void
 Editor::export_region ()
@@ -114,30 +141,32 @@ Editor::export_region ()
 	boost::shared_ptr<Region> r = selection->regions.front()->region();
 	boost::shared_ptr<AudioRegion> audio_region = boost::dynamic_pointer_cast<AudioRegion>(r);
 	boost::shared_ptr<MidiRegion> midi_region = boost::dynamic_pointer_cast<MidiRegion>(r);
-	
+
 	if (audio_region) {
-		
+
 		RouteTimeAxisView & rtv (dynamic_cast<RouteTimeAxisView &> (selection->regions.front()->get_time_axis_view()));
 		AudioTrack & track (dynamic_cast<AudioTrack &> (*rtv.route()));
-		
+
 		ExportRegionDialog dialog (*this, *(audio_region.get()), track);
 		dialog.set_session (_session);
 		dialog.run ();
-		
+
 	} else if (midi_region) {
 
 		MidiExportDialog dialog (*this, midi_region);
 		dialog.set_session (_session);
-		int ret = dialog.run ();
-		switch (ret) {
-		case Gtk::RESPONSE_ACCEPT:
-			break;
-		default:
-			return;
-		}
 
-		string path = dialog.get_path ();
-		(void) midi_region->clone (path);
+		bool finished = false;
+		while (!finished) {
+			switch (dialog.run ()) {
+			case Gtk::RESPONSE_ACCEPT:
+				finished = process_midi_export_dialog (dialog, midi_region);
+				break;
+			default:
+				finished = true;
+				return;
+			}
+		}
 	}
 }
 
@@ -199,7 +228,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 	vector<boost::shared_ptr<AudioFileSource> > sources;
 	uint32_t nchans;
 
-	const string sound_directory = _session->session_directory().sound_path().to_string();
+	const string sound_directory = _session->session_directory().sound_path();
 
 	nchans = region->n_channels();
 
@@ -241,7 +270,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 			try {
 				fs = boost::dynamic_pointer_cast<AudioFileSource> (
 					SourceFactory::createWritable (DataType::AUDIO, *_session,
-					                               path, string(), true,
+					                               path, true,
 					                               false, _session->frame_rate()));
 			}
 
@@ -349,7 +378,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 	string path;
 	vector<boost::shared_ptr<AudioFileSource> > sources;
 
-	const string sound_directory = _session->session_directory().sound_path().to_string();
+	const string sound_directory = _session->session_directory().sound_path();
 
 	uint32_t channels = count.n_audio();
 
@@ -380,7 +409,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 		try {
 			fs = boost::dynamic_pointer_cast<AudioFileSource> (
 				SourceFactory::createWritable (DataType::AUDIO, *_session,
-				                               path, string(), true,
+				                               path, true,
 				                               false, _session->frame_rate()));
 		}