X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_export_audio.cc;h=8159b784bc5e3f79dd1ba640b0d2df4eeaae449f;hb=0268489c7853780a91f289a409ec00c6e561526c;hp=e40030d671d5a7fe6a0b7b65df792a7dba6b0511;hpb=ee1b49f87e4b8e6406c059f29371892872d3fb85;p=ardour.git diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index e40030d671..8159b784bc 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -25,9 +25,7 @@ #include -#include - -#include "gtkmm2ext/choice.h" +#include "pbd/gstdio_compat.h" #include "pbd/pthread_utils.h" @@ -51,8 +49,9 @@ #include "public_editor.h" #include "selection.h" #include "time_axis_view.h" +#include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -86,11 +85,11 @@ Editor::export_selection () void Editor::export_range () { - Marker* marker; + ArdourMarker* marker; - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + if ((marker = reinterpret_cast (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 +102,30 @@ Editor::export_range () } } +bool +Editor::process_midi_export_dialog (MidiExportDialog& dialog, boost::shared_ptr 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()); + } + + return midi_region->do_export (path); +} + /** Export the first selected region */ void Editor::export_region () @@ -114,65 +137,31 @@ Editor::export_region () boost::shared_ptr r = selection->regions.front()->region(); boost::shared_ptr audio_region = boost::dynamic_pointer_cast(r); boost::shared_ptr midi_region = boost::dynamic_pointer_cast(r); - + if (audio_region) { - + RouteTimeAxisView & rtv (dynamic_cast (selection->regions.front()->get_time_axis_view())); AudioTrack & track (dynamic_cast (*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; - } - - 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) { + bool finished = false; + while (!finished) { + switch (dialog.run ()) { 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()); + finished = process_midi_export_dialog (dialog, midi_region); break; default: return; } - } - - (void) midi_region->clone (path); } } @@ -224,11 +213,11 @@ bool Editor::write_region (string path, boost::shared_ptr region) { boost::shared_ptr fs; - const framepos_t chunk_size = 4096; - framepos_t to_read; + const samplepos_t chunk_size = 4096; + samplepos_t to_read; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - framepos_t pos; + samplepos_t pos; char s[PATH_MAX+1]; uint32_t cnt; vector > sources; @@ -277,7 +266,7 @@ Editor::write_region (string path, boost::shared_ptr region) fs = boost::dynamic_pointer_cast ( SourceFactory::createWritable (DataType::AUDIO, *_session, path, true, - false, _session->frame_rate())); + false, _session->sample_rate())); } catch (failed_constructor& err) { @@ -296,7 +285,7 @@ Editor::write_region (string path, boost::shared_ptr region) pos = region->position(); while (to_read) { - framepos_t this_time; + samplepos_t this_time; this_time = min (to_read, chunk_size); @@ -374,11 +363,11 @@ bool Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list& range) { boost::shared_ptr fs; - const framepos_t chunk_size = 4096; - framepos_t nframes; + const samplepos_t chunk_size = 4096; + samplepos_t nframes; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - framepos_t pos; + samplepos_t pos; char s[PATH_MAX+1]; uint32_t cnt; string path; @@ -416,7 +405,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list fs = boost::dynamic_pointer_cast ( SourceFactory::createWritable (DataType::AUDIO, *_session, path, true, - false, _session->frame_rate())); + false, _session->sample_rate())); } catch (failed_constructor& err) { @@ -434,7 +423,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list pos = (*i).start; while (nframes) { - framepos_t this_time; + samplepos_t this_time; this_time = min (nframes, chunk_size); @@ -466,7 +455,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list while (nframes) { - framepos_t this_time = min (nframes, chunk_size); + samplepos_t this_time = min (nframes, chunk_size); memset (buf, 0, sizeof (Sample) * this_time); for (uint32_t n=0; n < channels; ++n) {