X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_export_audio.cc;h=9b0a7c7cb590f2ff412f49a284fa304189b39b0b;hb=fc7a2e9ee1616cdcb78d6b60804baff336ad07ee;hp=46a704b435003603f35fde7ff0e72cd32caf89a8;hpb=6f4a92f740b2fd75794489ce58f9348f8adf6bf4;p=ardour.git diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 46a704b435..9b0a7c7cb5 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -15,9 +15,10 @@ 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 @@ -41,6 +42,10 @@ #include #include #include +#include +#include +#include +#include #include "i18n.h" @@ -53,7 +58,7 @@ void Editor::export_session() { if (session) { - export_range (0, session->current_end_frame()); + export_range (session->current_start_frame(), session->current_end_frame()); } } @@ -72,7 +77,7 @@ Editor::export_selection () } void -Editor::export_range (jack_nframes_t start, jack_nframes_t end) +Editor::export_range (nframes_t start, nframes_t end) { if (session) { if (export_dialog == 0) { @@ -85,19 +90,20 @@ Editor::export_range (jack_nframes_t start, jack_nframes_t end) } } +/** 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()); + boost::shared_ptr r = selection->regions.front()->region(); + + ExportDialog* dialog = new ExportRegionDialog (*this, r); dialog->connect_to_session (session); - dialog->set_range ( - clicked_regionview->region().first_frame(), - clicked_regionview->region().last_frame()); + dialog->set_range (r->first_frame(), r->last_frame()); dialog->start_export(); } @@ -126,6 +132,7 @@ 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) @@ -140,7 +147,7 @@ Editor::bounce_region_selection () { for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { - Region& region ((*i)->region()); + boost::shared_ptr region ((*i)->region()); RouteTimeAxisView* rtv = dynamic_cast(&(*i)->get_time_axis_view()); Track* track = dynamic_cast(rtv->route().get()); @@ -150,30 +157,31 @@ Editor::bounce_region_selection () itt.cancel = false; itt.progress = 0.0f; - track->bounce_range (region.position(), region.position() + region.length(), itt); + track->bounce_range (region->position(), region->position() + region->length(), itt); } } bool -Editor::write_region (string path, AudioRegion& region) +Editor::write_region (string path, boost::shared_ptr region) { - AudioFileSource* fs; - const jack_nframes_t chunk_size = 4096; - jack_nframes_t to_read; + boost::shared_ptr fs; + const nframes_t chunk_size = 4096; + nframes_t to_read; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - char workbuf[chunk_size *4]; - jack_nframes_t pos; + nframes_t pos; char s[PATH_MAX+1]; uint32_t cnt; - vector sources; + vector > sources; uint32_t nchans; - - nchans = region.n_channels(); + + 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()) { /* XXX should link(2) to create a new inode with "path" */ return true; } @@ -184,12 +192,12 @@ 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); + 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(), - legalize_for_path(region.name()).c_str(), cnt, n); + snprintf (s, sizeof(s), "%s/%s_%" PRIu32 "-%" PRId32 ".wav", sound_directory.c_str(), + legalize_for_path(region->name()).c_str(), cnt, n); } path = s; @@ -207,7 +215,7 @@ Editor::write_region (string path, AudioRegion& region) try { - fs = AudioFileSource::create (path); + fs = boost::dynamic_pointer_cast (SourceFactory::createWritable (DataType::AUDIO, *session, path, false, session->frame_rate())); } catch (failed_constructor& err) { @@ -222,23 +230,23 @@ 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; + nframes_t this_time; this_time = min (to_read, chunk_size); - for (vector::iterator src=sources.begin(); src != sources.end(); ++src) { + for (vector >::iterator src=sources.begin(); src != sources.end(); ++src) { fs = (*src); - if (region.read_at (buf, buf, gain_buffer, workbuf, pos, this_time) != this_time) { + if (region->read_at (buf, buf, gain_buffer, pos, this_time) != this_time) { break; } - if (fs->write (buf, this_time, workbuf) != this_time) { + if (fs->write (buf, this_time) != this_time) { error << "" << endmsg; goto error_out; } @@ -253,18 +261,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; @@ -289,7 +296,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; @@ -302,29 +309,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) { - AudioFileSource* fs; - const jack_nframes_t chunk_size = 4096; - jack_nframes_t nframes; + boost::shared_ptr fs; + const nframes_t chunk_size = 4096; + nframes_t nframes; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - char workbuf[chunk_size*4]; - jack_nframes_t pos; + nframes_t pos; char s[PATH_MAX+1]; uint32_t cnt; string path; - vector sources; + 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); } @@ -341,7 +351,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list (SourceFactory::createWritable (DataType::AUDIO, *session, path, false, session->frame_rate())); } catch (failed_constructor& err) { @@ -359,7 +369,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, listwrite (buf, this_time, workbuf) != this_time) { + if (fs->write (buf, this_time) != this_time) { goto error_out; } } @@ -391,13 +401,13 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, listwrite (buf, this_time, workbuf) != this_time) { + if (fs->write (buf, this_time) != this_time) { goto error_out; } } @@ -414,8 +424,9 @@ 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? } @@ -424,9 +435,8 @@ Editor::write_audio_range (AudioPlaylist& 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;