X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Feditor_export_audio.cc;h=ca73c4d8b07002c26184d12a33f69d0e6b8de5b2;hb=f19c01bbb42f4e80769adb8e3e1015724fe9d6c6;hp=dc7fadb4702a4b572d267e0d2aa0d71ad271516a;hpb=6535cd1b1dbab7cc59a356c81d92dbc2cf25333b;p=ardour.git diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index dc7fadb470..ca73c4d8b0 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -15,17 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ +/* Note: public Editor methods are documented in public_editor.h */ + #include #include #include -#include "export_session_dialog.h" -#include "export_region_dialog.h" -#include "export_range_markers_dialog.h" +#include "export_dialog.h" #include "editor.h" #include "public_editor.h" #include "selection.h" @@ -33,16 +32,17 @@ #include "audio_time_axis.h" #include "audio_region_view.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "pbd/pthread_utils.h" +#include "ardour/types.h" +#include "ardour/audio_track.h" +#include "ardour/audiofilesource.h" +#include "ardour/audio_diskstream.h" +#include "ardour/audioregion.h" +#include "ardour/audioplaylist.h" +#include "ardour/chan_count.h" +#include "ardour/session_directory.h" +#include "ardour/source_factory.h" +#include "ardour/audiofilesource.h" #include "i18n.h" @@ -52,82 +52,71 @@ using namespace PBD; using namespace Gtk; void -Editor::export_session() +Editor::export_audio () { - if (session) { - export_range (0, session->current_end_frame()); - } + ExportDialog dialog (*this); + dialog.set_session (session); + dialog.run(); } void Editor::export_selection () { - if (session) { - if (selection->time.empty()) { - 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); - } + ExportSelectionDialog dialog (*this); + dialog.set_session (session); + dialog.run(); } void -Editor::export_range (jack_nframes_t start, jack_nframes_t end) +Editor::export_range () { - if (session) { - if (export_dialog == 0) { - export_dialog = new ExportSessionDialog (*this); - } - - export_dialog->connect_to_session (session); - export_dialog->set_range (start, end); - export_dialog->start_export(); + Marker* marker; + + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; + /*NOTREACHED*/ } -} + Location* l; + bool is_start; + + if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) { + ExportRangeDialog dialog (*this, l->id().to_s()); + dialog.set_session (session); + dialog.run(); + } +} + +/** Export the first selected region */ void Editor::export_region () { - if (clicked_regionview == 0) { + if (selection->regions.empty()) { return; } - - ExportDialog* dialog = new ExportRegionDialog (*this, clicked_regionview->region()); + + try { + boost::shared_ptr r = selection->regions.front()->region(); + AudioRegion & region (dynamic_cast (*r)); - dialog->connect_to_session (session); - dialog->set_range ( - clicked_regionview->region()->first_frame(), - clicked_regionview->region()->last_frame()); - dialog->start_export(); -} - -void -Editor::export_range_markers () -{ - if (session) { - - 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; - } + RouteTimeAxisView & rtv (dynamic_cast (selection->regions.front()->get_time_axis_view())); + AudioTrack & track (dynamic_cast (*rtv.route())); - - if (export_range_markers_dialog == 0) { - export_range_markers_dialog = new ExportRangeMarkersDialog(*this); - } + ExportRegionDialog dialog (*this, region, track); + dialog.set_session (session); + dialog.run(); - export_range_markers_dialog->connect_to_session (session); - export_range_markers_dialog->start_export(); + } catch (std::bad_cast & e) { + error << "Exporting Region failed!" << endmsg; + return; } -} +} int Editor::write_region_selection (RegionSelection& regions) { for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { + // FIXME AudioRegionView* arv = dynamic_cast(*i); if (arv) if (write_region ("", arv->audio_region()) == false) @@ -152,7 +141,12 @@ 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; } } @@ -160,21 +154,23 @@ bool Editor::write_region (string path, boost::shared_ptr region) { boost::shared_ptr fs; - const jack_nframes_t chunk_size = 4096; - jack_nframes_t to_read; + 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; uint32_t nchans; - + + const string sound_directory = session->session_directory().sound_path().to_string(); + 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(0)) { /* XXX should link(2) to create a new inode with "path" */ return true; } @@ -185,11 +181,11 @@ Editor::write_region (string path, boost::shared_ptr region) for (cnt = 0; cnt < 999999; ++cnt) { if (nchans == 1) { - snprintf (s, sizeof(s), "%s/%s_%" PRIu32 ".wav", session->sound_dir().c_str(), + snprintf (s, sizeof(s), "%s/%s_%" PRIu32 ".wav", sound_directory.c_str(), legalize_for_path(region->name()).c_str(), cnt); } else { - snprintf (s, sizeof(s), "%s/%s_%" PRIu32 "-%" PRId32 ".wav", session->sound_dir().c_str(), + snprintf (s, sizeof(s), "%s/%s_%" PRIu32 "-%" PRId32 ".wav", sound_directory.c_str(), legalize_for_path(region->name()).c_str(), cnt, n); } @@ -208,7 +204,10 @@ Editor::write_region (string path, boost::shared_ptr region) try { - fs = boost::dynamic_pointer_cast (SourceFactory::createReadable (path, AudioFileSource::Flag (0))); + fs = boost::dynamic_pointer_cast ( + SourceFactory::createWritable (DataType::AUDIO, *session, + path, true, + false, session->frame_rate())); } catch (failed_constructor& err) { @@ -227,7 +226,7 @@ Editor::write_region (string path, boost::shared_ptr region) pos = region->position(); while (to_read) { - jack_nframes_t this_time; + nframes64_t this_time; this_time = min (to_read, chunk_size); @@ -256,6 +255,7 @@ Editor::write_region (string path, boost::shared_ptr region) for (vector >::iterator src = sources.begin(); src != sources.end(); ++src) { (*src)->update_header (0, *now, tnow); + (*src)->mark_immutable (); } return true; @@ -288,7 +288,7 @@ Editor::write_audio_selection (TimeSelection& ts) if (atv->is_audio_track()) { - AudioPlaylist* playlist = dynamic_cast(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; @@ -301,28 +301,32 @@ Editor::write_audio_selection (TimeSelection& ts) } bool -Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list& range) +Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list& range) { boost::shared_ptr fs; - const jack_nframes_t chunk_size = 4096; - jack_nframes_t nframes; + 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; + const string sound_directory = session->session_directory().sound_path().to_string(); + + uint32_t channels = count.n_audio(); + for (uint32_t n=0; n < channels; ++n) { for (cnt = 0; cnt < 999999; ++cnt) { if (channels == 1) { - snprintf (s, sizeof(s), "%s/%s_%" PRIu32 ".wav", session->sound_dir().c_str(), + snprintf (s, sizeof(s), "%s/%s_%" PRIu32 ".wav", sound_directory.c_str(), legalize_for_path(playlist.name()).c_str(), cnt); } else { - snprintf (s, sizeof(s), "%s/%s_%" PRIu32 "-%" PRId32 ".wav", session->sound_dir().c_str(), + snprintf (s, sizeof(s), "%s/%s_%" PRIu32 "-%" PRId32 ".wav", sound_directory.c_str(), legalize_for_path(playlist.name()).c_str(), cnt, n); } @@ -339,7 +343,10 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list (SourceFactory::createReadable (path, AudioFileSource::Flag (0))); + fs = boost::dynamic_pointer_cast ( + SourceFactory::createWritable (DataType::AUDIO, *session, + path, true, + false, session->frame_rate())); } catch (failed_constructor& err) { @@ -357,7 +364,7 @@ Editor::write_audio_range (AudioPlaylist& 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? }