#include "selection.h"
#include "time_axis_view.h"
#include "audio_time_axis.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
#include <pbd/pthread_utils.h>
#include <ardour/types.h>
#include <ardour/audio_diskstream.h>
#include <ardour/audioregion.h>
#include <ardour/audioplaylist.h>
+#include <ardour/chan_count.h>
+#include <ardour/source_factory.h>
+#include <ardour/audiofilesource.h>
#include "i18n.h"
Editor::export_session()
{
if (session) {
- export_range (0, session->current_end_frame());
+ export_range (session->current_start_frame(), session->current_end_frame());
}
}
}
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) {
return;
}
- ExportDialog* dialog = new ExportRegionDialog (*this, &clicked_regionview->region());
+ 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());
+ clicked_regionview->region()->first_frame(),
+ clicked_regionview->region()->last_frame());
dialog->start_export();
}
{
for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
- Region& region ((*i)->region());
- RouteTimeAxisView* atv = dynamic_cast<RouteTimeAxisView*>(&(*i)->get_time_axis_view());
- Track* track = dynamic_cast<Track*>(&(atv->route()));
+ boost::shared_ptr<Region> region ((*i)->region());
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&(*i)->get_time_axis_view());
+ Track* track = dynamic_cast<Track*>(rtv->route().get());
InterThreadInfo itt;
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<AudioRegion> region)
{
- AudioFileSource* fs;
- const jack_nframes_t chunk_size = 4096;
- jack_nframes_t to_read;
+ boost::shared_ptr<AudioFileSource> 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<AudioFileSource *> sources;
+ vector<boost::shared_ptr<AudioFileSource> > 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;
}
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;
try {
- fs = AudioFileSource::create (path);
+ fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (DataType::AUDIO, *session, path, false, session->frame_rate()));
}
catch (failed_constructor& err) {
}
- 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<AudioFileSource *>::iterator src=sources.begin(); src != sources.end(); ++src) {
+ for (vector<boost::shared_ptr<AudioFileSource> >::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;
}
time (&tnow);
now = localtime (&tnow);
- for (vector<AudioFileSource *>::iterator src = sources.begin(); src != sources.end(); ++src) {
+ for (vector<boost::shared_ptr<AudioFileSource> >::iterator src = sources.begin(); src != sources.end(); ++src) {
(*src)->update_header (0, *now, tnow);
+ (*src)->mark_immutable ();
}
return true;
error_out:
- for (vector<AudioFileSource*>::iterator i = sources.begin(); i != sources.end(); ++i) {
-
+ for (vector<boost::shared_ptr<AudioFileSource> >::iterator i = sources.begin(); i != sources.end(); ++i) {
(*i)->mark_for_remove ();
- delete (*i);
}
return 0;
if (atv->is_audio_track()) {
- AudioPlaylist* playlist = dynamic_cast<AudioPlaylist*>(atv->get_diskstream()->playlist());
+ boost::shared_ptr<AudioPlaylist> playlist = boost::dynamic_pointer_cast<AudioPlaylist>(atv->get_diskstream()->playlist());
if (playlist && write_audio_range (*playlist, atv->get_diskstream()->n_channels(), ts) == 0) {
ret = -1;
}
bool
-Editor::write_audio_range (AudioPlaylist& playlist,
uint32_t channels, list<AudioRange>& range)
+Editor::write_audio_range (AudioPlaylist& playlist,
const ChanCount& count, list<AudioRange>& range)
{
- AudioFileSource* fs;
- const jack_nframes_t chunk_size = 4096;
- jack_nframes_t nframes;
+ boost::shared_ptr<AudioFileSource> 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<AudioFileSource *> sources;
+ vector<boost::shared_ptr<AudioFileSource> > sources;
+
+ uint32_t channels = count.get(DataType::AUDIO);
for (uint32_t n=0; n < channels; ++n) {
path = s;
try {
- fs = AudioFileSource::create (path);
+ fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (DataType::AUDIO, *session, path, false, session->frame_rate()));
}
catch (failed_constructor& err) {
pos = (*i).start;
while (nframes) {
- jack_nframes_t this_time;
+ nframes_t this_time;
this_time = min (nframes, chunk_size);
fs = sources[n];
- if (playlist.read (buf, buf, gain_buffer, workbuf, pos, this_time, n) != this_time) {
+ if (playlist.read (buf, buf, gain_buffer, pos, this_time, n) != this_time) {
break;
}
- if (fs->write (buf, this_time, workbuf) != this_time) {
+ if (fs->write (buf, this_time) != this_time) {
goto error_out;
}
}
while (nframes) {
- jack_nframes_t this_time = min (nframes, chunk_size);
+ nframes_t this_time = min (nframes, chunk_size);
memset (buf, 0, sizeof (Sample) * this_time);
for (uint32_t n=0; n < channels; ++n) {
fs = sources[n];
- if (fs->write (buf, this_time, workbuf) != this_time) {
+ if (fs->write (buf, this_time) != this_time) {
goto error_out;
}
}
time (&tnow);
now = localtime (&tnow);
- for (uint32_t n=0; n < channels; ++n) {
- sources[n]->update_header (0, *now, tnow);
+ for (vector<boost::shared_ptr<AudioFileSource> >::iterator s = sources.begin(); s != sources.end(); ++s) {
+ (*s)->update_header (0, *now, tnow);
+ (*s)->mark_immutable ();
// do we need to ref it again?
}
error_out:
/* unref created files */
- for (vector<AudioFileSource*>::iterator i = sources.begin(); i != sources.end(); ++i) {
+ for (vector<boost::shared_ptr<AudioFileSource> >::iterator i = sources.begin(); i != sources.end(); ++i) {
(*i)->mark_for_remove ();
- delete *i;
}
return false;
projects / ardour.git / blobdiff