Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / editor_export_audio.cc

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 9521f6a0c676be686a814236e35b1d2fec3c5163..e40030d671d5a7fe6a0b7b65df792a7dba6b0511 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -25,14 +25,14 @@
 
 #include <gtkmm/messagedialog.h>
 
+#include <glib/gstdio.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"
@@ -62,7 +62,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();
 }
@@ -136,7 +136,42 @@ Editor::export_region ()
                        return;
                }
 
+               dialog.hide ();
+
                string path = dialog.get_path ();
+
+               if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
+
+                       MessageDialog checker (_("File Exists!"),
+                                              true,
+                                              Gtk::MESSAGE_WARNING,
+                                              Gtk::BUTTONS_NONE);
+                       
+                       checker.set_title (_("File Exists!"));
+
+                       checker.add_button (Stock::CANCEL, RESPONSE_CANCEL);
+                       checker.add_button (_("Overwrite Existing File"), RESPONSE_ACCEPT);
+                       checker.set_default_response (RESPONSE_CANCEL);
+                       
+                       checker.set_wmclass (X_("midi_export_file_exists"), PROGRAM_NAME);
+                       checker.set_position (Gtk::WIN_POS_MOUSE);
+
+                       ret = checker.run ();
+
+                       switch (ret) {
+                       case Gtk::RESPONSE_ACCEPT:
+                               /* 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());
+                               break;
+                       default:
+                               return;
+                       }
+                       
+               }
+
                (void) midi_region->clone (path);
        }
 }
@@ -199,7 +234,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 +276,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 +384,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 +415,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()));
                }