#include "pbd/error.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
PortExportChannel::PortExportChannel ()
- : buffer_size(0)
+ : _buffer_size (0)
{
}
-void PortExportChannel::set_max_buffer_size(framecnt_t frames)
+PortExportChannel::~PortExportChannel ()
{
- buffer_size = frames;
- buffer.reset (new Sample[frames]);
+ _delaylines.clear ();
+}
+
+void PortExportChannel::set_max_buffer_size(samplecnt_t samples)
+{
+ _buffer_size = samples;
+ _buffer.reset (new Sample[samples]);
+
+ _delaylines.clear ();
+
+ for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) {
+ boost::shared_ptr<AudioPort> p = it->lock ();
+ if (!p) { continue; }
+ samplecnt_t latency = p->private_latency_range (true).max;
+ PBD::RingBuffer<Sample>* rb = new PBD::RingBuffer<Sample> (latency + 1 + _buffer_size);
+ for (samplepos_t i = 0; i < latency; ++i) {
+ Sample zero = 0;
+ rb->write (&zero, 1);
+ }
+ _delaylines.push_back (boost::shared_ptr<PBD::RingBuffer<Sample> >(rb));
+ }
}
bool
}
void
-PortExportChannel::read (Sample const *& data, framecnt_t frames) const
+PortExportChannel::read (Sample const *& data, samplecnt_t samples) const
{
- assert(buffer);
- assert(frames <= buffer_size);
+ assert(_buffer);
+ assert(samples <= _buffer_size);
- if (ports.size() == 1) {
+ if (ports.size() == 1 && _delaylines.size() ==1 && _delaylines.front()->bufsize () == _buffer_size + 1) {
boost::shared_ptr<AudioPort> p = ports.begin()->lock ();
- data = p->get_audio_buffer(frames).data();
+ AudioBuffer& ab (p->get_audio_buffer(samples)); // unsets AudioBuffer::_written
+ data = ab.data();
+ ab.set_written (true);
return;
}
- memset (buffer.get(), 0, frames * sizeof (Sample));
+ memset (_buffer.get(), 0, samples * sizeof (Sample));
+ std::list <boost::shared_ptr<PBD::RingBuffer<Sample> > >::const_iterator di = _delaylines.begin ();
for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) {
boost::shared_ptr<AudioPort> p = it->lock ();
- if (p) {
- Sample* port_buffer = p->get_audio_buffer(frames).data();
-
- for (uint32_t i = 0; i < frames; ++i) {
- buffer[i] += (float) port_buffer[i];
- }
+ if (!p) {
+ continue;
+ }
+ AudioBuffer& ab (p->get_audio_buffer(samples)); // unsets AudioBuffer::_written
+ Sample* port_buffer = ab.data();
+ ab.set_written (true);
+ (*di)->write (port_buffer, samples);
+ // TODO optimze, get_read_vector()
+ for (uint32_t i = 0; i < samples; ++i) {
+ Sample spl;
+ (*di)->read (&spl, 1);
+ _buffer[i] += spl;
}
+ ++di;
}
- data = buffer.get();
+ data = _buffer.get();
}
void
for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) {
boost::shared_ptr<Port> p = it->lock ();
if (p && (port_node = node->add_child ("Port"))) {
- port_node->add_property ("name", p->name());
+ port_node->set_property ("name", p->name());
}
}
}
void
PortExportChannel::set_state (XMLNode * node, Session & session)
{
- XMLProperty * prop;
XMLNodeList xml_ports = node->children ("Port");
for (XMLNodeList::iterator it = xml_ports.begin(); it != xml_ports.end(); ++it) {
- if ((prop = (*it)->property ("name"))) {
- std::string const & name = prop->value();
+ std::string name;
+ if ((*it)->get_property ("name", name)) {
boost::shared_ptr<AudioPort> port = boost::dynamic_pointer_cast<AudioPort> (session.engine().get_port_by_name (name));
if (port) {
ports.insert (port);
}
}
-RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type)
+RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type)
: region (region)
, track (track)
, type (type)
- , frames_per_cycle (session->engine().samples_per_cycle ())
+ , samples_per_cycle (session->engine().samples_per_cycle ())
, buffers_up_to_date (false)
, region_start (region.position())
, position (region_start)
case Fades:
n_channels = region.n_channels();
- mixdown_buffer.reset (new Sample [frames_per_cycle]);
- gain_buffer.reset (new Sample [frames_per_cycle]);
- std::fill_n (gain_buffer.get(), frames_per_cycle, Sample (1.0));
+ mixdown_buffer.reset (new Sample [samples_per_cycle]);
+ gain_buffer.reset (new Sample [samples_per_cycle]);
+ std::fill_n (gain_buffer.get(), samples_per_cycle, Sample (1.0));
break;
case Processed:
session->ProcessExport.connect_same_thread (export_connection, boost::bind (&RegionExportChannelFactory::new_cycle_started, this, _1));
- buffers.ensure_buffers (DataType::AUDIO, n_channels, frames_per_cycle);
+ buffers.ensure_buffers (DataType::AUDIO, n_channels, samples_per_cycle);
buffers.set_count (ChanCount (DataType::AUDIO, n_channels));
}
}
void
-RegionExportChannelFactory::read (uint32_t channel, Sample const *& data, framecnt_t frames_to_read)
+RegionExportChannelFactory::read (uint32_t channel, Sample const *& data, samplecnt_t samples_to_read)
{
assert (channel < n_channels);
- assert (frames_to_read <= frames_per_cycle);
+ assert (samples_to_read <= samples_per_cycle);
if (!buffers_up_to_date) {
- update_buffers(frames_to_read);
+ update_buffers(samples_to_read);
buffers_up_to_date = true;
}
}
void
-RegionExportChannelFactory::update_buffers (framecnt_t frames)
+RegionExportChannelFactory::update_buffers (samplecnt_t samples)
{
- assert (frames <= frames_per_cycle);
+ assert (samples <= samples_per_cycle);
switch (type) {
case Raw:
for (size_t channel = 0; channel < n_channels; ++channel) {
- region.read (buffers.get_audio (channel).data(), position - region_start, frames, channel);
+ region.read (buffers.get_audio (channel).data(), position - region_start, samples, channel);
}
break;
case Fades:
assert (mixdown_buffer && gain_buffer);
for (size_t channel = 0; channel < n_channels; ++channel) {
- memset (mixdown_buffer.get(), 0, sizeof (Sample) * frames);
- region.read_at (buffers.get_audio (channel).data(), mixdown_buffer.get(), gain_buffer.get(), position, frames, channel);
+ memset (mixdown_buffer.get(), 0, sizeof (Sample) * samples);
+ buffers.get_audio (channel).silence(samples);
+ region.read_at (buffers.get_audio (channel).data(), mixdown_buffer.get(), gain_buffer.get(), position, samples, channel);
}
break;
case Processed:
- track.export_stuff (buffers, position, frames, track.main_outs(), true, true);
+ track.export_stuff (buffers, position, samples, track.main_outs(), true, true, false);
break;
default:
throw ExportFailed ("Unhandled type in ExportChannelFactory::update_buffers");
}
- position += frames;
+ position += samples;
}
}
void
-RouteExportChannel::set_max_buffer_size(framecnt_t frames)
+RouteExportChannel::set_max_buffer_size(samplecnt_t samples)
{
if (processor) {
- processor->set_block_size (frames);
+ processor->set_block_size (samples);
}
}
void
-RouteExportChannel::read (Sample const *& data, framecnt_t frames) const
+RouteExportChannel::read (Sample const *& data, samplecnt_t samples) const
{
assert(processor);
AudioBuffer const & buffer = processor->get_capture_buffers().get_audio (channel);
#ifndef NDEBUG
- (void) frames;
+ (void) samples;
#else
- assert (frames <= (framecnt_t) buffer.size());
+ assert (samples <= (samplecnt_t) buffer.capacity());
#endif
data = buffer.data();
}
projects / ardour.git / blobdiff