X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_export_audio.cc;h=776832143628bf879b570275f82bcc2c2c88fdb6;hb=39a4068e36f632f2ff8abf99881d40e26d7e5183;hp=2ffbbadb5c6fea98a8d5b138b2236761eb6955fb;hpb=e493b2b7c4fbbbfc457f02babf9546289b430177;p=ardour.git diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 2ffbbadb5c..7768321436 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -15,40 +15,46 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include #include -#include "export_dialog.h" + +#include + +#include "export_session_dialog.h" +#include "export_region_dialog.h" +#include "export_range_markers_dialog.h" #include "editor.h" #include "public_editor.h" #include "selection.h" #include "time_axis_view.h" #include "audio_time_axis.h" -#include "regionview.h" -#include "ardour_message.h" +#include "audio_region_view.h" #include #include #include #include -#include -#include +#include +#include #include #include +#include +#include #include "i18n.h" using namespace std; using namespace ARDOUR; +using namespace PBD; using namespace Gtk; void Editor::export_session() { if (session) { - export_range (0, session->current_end_frame()); + export_range (session->current_start_frame(), session->current_end_frame()); } } @@ -57,21 +63,21 @@ Editor::export_selection () { if (session) { if (selection->time.empty()) { - ArdourMessage message (this, X_("norange"), _("There is no range to export.\n\nSelect a range using the range mouse mode")); + MessageDialog message (*this, _("There is no selection to export.\n\nSelect a selection using the range mouse mode")); + message.run (); return; } - export_range (selection->time.front().start, - selection->time.front().end); + export_range (selection->time.front().start, selection->time.front().end); } } void -Editor::export_range (jack_nframes_t start, jack_nframes_t end) +Editor::export_range (nframes64_t start, nframes64_t end) { if (session) { if (export_dialog == 0) { - export_dialog = new ExportDialog (*this); + export_dialog = new ExportSessionDialog (*this); } export_dialog->connect_to_session (session); @@ -87,59 +93,55 @@ Editor::export_region () return; } - ExportDialog* dialog = new ExportDialog (*this, &clicked_regionview->region); + ExportDialog* dialog = new ExportRegionDialog (*this, clicked_regionview->region()); dialog->connect_to_session (session); - dialog->set_range (0, clicked_regionview->region.length()); + dialog->set_range (clicked_regionview->region()->first_frame(), clicked_regionview->region()->last_frame()); dialog->start_export(); } void -Editor::write_a_region () +Editor::export_range_markers () { - if (clicked_regionview == 0) { - return; - } - - FileSelection file_selector; - - file_selector.get_selection_entry()->activate.connect (bind (slot (*this, &Editor::finish_sub_event_loop), 1)); - file_selector.get_cancel_button()-.signal_clicked().connect (bind (slot (*this, &Editor::finish_sub_event_loop), -1)); - file_selector.get_ok_button()-.signal_clicked().connect (bind (slot (*this, &Editor::finish_sub_event_loop), 1)); - file_selector.delete_event.connect (bind (slot (*this, &Editor::finish_sub_event_loop_on_delete), -1)); + if (session) { - file_selector.show_all(); + if (session->locations()->num_range_markers() == 0) { + MessageDialog message (*this, _("There are no ranges to export.\n\nCreate 1 or more ranges by dragging the mouse in the range bar")); + message.run (); + return; + } + - run_sub_event_loop (); - - if (sub_event_loop_status == 1) { - string path = file_selector.get_filename(); - printf ("got region: %s\n", path.c_str()); - if (path.length()) { - write_region (path, clicked_regionview->region); - } + if (export_range_markers_dialog == 0) { + export_range_markers_dialog = new ExportRangeMarkersDialog(*this); + } + + export_range_markers_dialog->connect_to_session (session); + export_range_markers_dialog->start_export(); } -} +} int -Editor::write_region_selection (AudioRegionSelection& regions) +Editor::write_region_selection (RegionSelection& regions) { - for (AudioRegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { - if (write_region ("", (*i)->region) == false) { - return -1; - } + for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { + AudioRegionView* arv = dynamic_cast(*i); + if (arv) + if (write_region ("", arv->audio_region()) == false) + return -1; } + return 0; } void Editor::bounce_region_selection () { - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { - AudioRegion& region ((*i)->region); - AudioTimeAxisView* atv = dynamic_cast(&(*i)->get_time_axis_view()); - AudioTrack* track = dynamic_cast(&(atv->route())); + boost::shared_ptr region ((*i)->region()); + RouteTimeAxisView* rtv = dynamic_cast(&(*i)->get_time_axis_view()); + Track* track = dynamic_cast(rtv->route().get()); InterThreadInfo itt; @@ -147,29 +149,34 @@ Editor::bounce_region_selection () itt.cancel = false; itt.progress = 0.0f; - track->bounce_range (region.position(), region.position() + region.length(), itt); + boost::shared_ptr 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; } } bool -Editor::write_region (string path, AudioRegion& region) +Editor::write_region (string path, boost::shared_ptr region) { - FileSource* fs; - const jack_nframes_t chunk_size = 4096; - jack_nframes_t to_read; + boost::shared_ptr fs; + const nframes64_t chunk_size = 4096; + nframes64_t to_read; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - jack_nframes_t pos; + nframes64_t pos; char s[PATH_MAX+1]; uint32_t cnt; - vector sources; + vector > sources; uint32_t nchans; - nchans = region.n_channels(); + nchans = region->n_channels(); /* don't do duplicate of the entire source if that's what is going on here */ - if (region.start() == 0 && region.length() == region.source().length()) { + if (region->start() == 0 && region->length() == region->source()->length()) { /* XXX should link(2) to create a new inode with "path" */ return true; } @@ -181,11 +188,11 @@ Editor::write_region (string path, AudioRegion& region) for (cnt = 0; cnt < 999999; ++cnt) { if (nchans == 1) { snprintf (s, sizeof(s), "%s/%s_%" PRIu32 ".wav", session->sound_dir().c_str(), - legalize_for_path(region.name()).c_str(), cnt); + legalize_for_path(region->name()).c_str(), cnt); } else { snprintf (s, sizeof(s), "%s/%s_%" PRIu32 "-%" PRId32 ".wav", session->sound_dir().c_str(), - legalize_for_path(region.name()).c_str(), cnt, n); + legalize_for_path(region->name()).c_str(), cnt, n); } path = s; @@ -203,7 +210,7 @@ Editor::write_region (string path, AudioRegion& region) try { - fs = new FileSource (path, session->frame_rate()); + fs = boost::dynamic_pointer_cast (SourceFactory::createWritable (*session, path, false, session->frame_rate())); } catch (failed_constructor& err) { @@ -218,19 +225,19 @@ Editor::write_region (string path, AudioRegion& region) } - to_read = region.length(); - pos = region.position(); + to_read = region->length(); + pos = region->position(); while (to_read) { - jack_nframes_t this_time; + nframes64_t this_time; this_time = min (to_read, chunk_size); - for (vector::iterator src=sources.begin(); src != sources.end(); ++src) { - - fs = (*src); + for (vector >::iterator src=sources.begin(); src != sources.end(); ++src) { - if (region.read_at (buf, buf, gain_buffer, pos, this_time) != this_time) { + fs = (*src); + + if (region->read_at (buf, buf, gain_buffer, pos, this_time) != this_time) { break; } @@ -249,17 +256,17 @@ Editor::write_region (string path, AudioRegion& region) time (&tnow); now = localtime (&tnow); - for (vector::iterator src = sources.begin(); src != sources.end(); ++src) { + for (vector >::iterator src = sources.begin(); src != sources.end(); ++src) { (*src)->update_header (0, *now, tnow); + (*src)->mark_immutable (); } return true; error_out: - for (vector::iterator i = sources.begin(); i != sources.end(); ++i) { + for (vector >::iterator i = sources.begin(); i != sources.end(); ++i) { (*i)->mark_for_remove (); - delete (*i); } return 0; @@ -284,7 +291,7 @@ Editor::write_audio_selection (TimeSelection& ts) if (atv->is_audio_track()) { - Playlist* playlist = atv->get_diskstream()->playlist(); + boost::shared_ptr playlist = boost::dynamic_pointer_cast(atv->get_diskstream()->playlist()); if (playlist && write_audio_range (*playlist, atv->get_diskstream()->n_channels(), ts) == 0) { ret = -1; @@ -297,18 +304,18 @@ Editor::write_audio_selection (TimeSelection& ts) } bool -Editor::write_audio_range (Playlist& playlist, uint32_t channels, list& range) +Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list& range) { - FileSource* fs; - const jack_nframes_t chunk_size = 4096; - jack_nframes_t nframes; + boost::shared_ptr fs; + const nframes64_t chunk_size = 4096; + nframes64_t nframes; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - jack_nframes_t pos; + nframes64_t pos; char s[PATH_MAX+1]; uint32_t cnt; string path; - vector sources; + vector > sources; for (uint32_t n=0; n < channels; ++n) { @@ -335,7 +342,7 @@ Editor::write_audio_range (Playlist& playlist, uint32_t channels, listframe_rate()); + fs = boost::dynamic_pointer_cast (SourceFactory::createWritable (*session, path, false, session->frame_rate())); } catch (failed_constructor& err) { @@ -353,7 +360,7 @@ Editor::write_audio_range (Playlist& playlist, uint32_t channels, listupdate_header (0, *now, tnow); + for (vector >::iterator s = sources.begin(); s != sources.end(); ++s) { + (*s)->update_header (0, *now, tnow); + (*s)->mark_immutable (); // do we need to ref it again? } @@ -418,9 +426,8 @@ Editor::write_audio_range (Playlist& playlist, uint32_t channels, list::iterator i = sources.begin(); i != sources.end(); ++i) { + for (vector >::iterator i = sources.begin(); i != sources.end(); ++i) { (*i)->mark_for_remove (); - delete *i; } return false; @@ -431,7 +438,7 @@ Editor::write_selection () { if (!selection->time.empty()) { write_audio_selection (selection->time); - } else if (!selection->audio_regions.empty()) { - write_region_selection (selection->audio_regions); + } else if (!selection->regions.empty()) { + write_region_selection (selection->regions); } }