X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_export_audio.cc;h=ac68f6d907cacb0d6226f4fd301211d6bfb47c2b;hb=e11b3f90c2d02735a071d526d67cfd0de90cbac3;hp=865796a1edbc0b951f938ed5d7ffdff7e1ff4a20;hpb=d4dd338beb813bcfe7470729cf6611aeea55cfa4;p=ardour.git diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 865796a1ed..ac68f6d907 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_main_dialog.h" #include "editor.h" #include "public_editor.h" #include "selection.h" @@ -35,12 +34,15 @@ #include #include -#include #include #include #include #include #include +#include +#include +#include +#include #include "i18n.h" @@ -50,82 +52,65 @@ using namespace PBD; using namespace Gtk; void -Editor::export_session() +Editor::export_audio () { - if (session) { - export_range (0, session->current_end_frame()); - } + ExportMainDialog 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); - } + ExportMainDialog dialog (*this); + dialog.set_session (session); + dialog.select_timespan (X_("selection")); + 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; -void -Editor::export_region () -{ - if (clicked_regionview == 0) { - return; + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; + /*NOTREACHED*/ } - ExportDialog* dialog = new ExportRegionDialog (*this, &clicked_regionview->region()); - - dialog->connect_to_session (session); - dialog->set_range ( - clicked_regionview->region().first_frame(), - clicked_regionview->region().last_frame()); - dialog->start_export(); + Location* l; + bool is_start; + + if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) { + ExportMainDialog dialog (*this); + dialog.set_session (session); + dialog.select_timespan (l->id().to_s()); + dialog.run(); + } } +/** Export the first selected region */ void -Editor::export_range_markers () +Editor::export_region () { - 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; - } - - - 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(); - } -} +// if (selection->regions.empty()) { +// return; +// } +// +// 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->start_export(); +} 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 +125,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,29 +135,36 @@ 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) { - AudioFileSource* 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(); + + 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; } @@ -183,12 +175,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; @@ -206,7 +198,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) { @@ -221,19 +213,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) { + for (vector >::iterator src=sources.begin(); src != sources.end(); ++src) { fs = (*src); - if (region.read_at (buf, buf, gain_buffer, pos, this_time) != this_time) { + if (region->read_at (buf, buf, gain_buffer, pos, this_time) != this_time) { break; } @@ -252,18 +244,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; @@ -288,7 +279,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 +292,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 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; + + 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 +334,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) { @@ -357,7 +352,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? } @@ -422,9 +418,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;