X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_channel.cc;h=936b0f8a625f148230fe2c5ac7143186fd79e852;hb=8d0ba5254751b88ac560a7ae3b2e7e736ac2dfcf;hp=42138453e6122fef08d7cd921f7ebe348c0c4ab6;hpb=aaa91db6d9592684258267981e619b44cc2b7c40;p=ardour.git diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 42138453e6..936b0f8a62 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -18,16 +18,33 @@ */ -#include -#include -#include -#include -#include -#include -#include +#include "ardour/audio_buffer.h" +#include "ardour/audio_port.h" +#include "ardour/audio_track.h" +#include "ardour/audioengine.h" +#include "ardour/audioregion.h" +#include "ardour/capturing_processor.h" +#include "ardour/export_channel.h" +#include "ardour/export_failed.h" +#include "ardour/session.h" + +#include "pbd/error.h" + +#include "i18n.h" using namespace ARDOUR; +PortExportChannel::PortExportChannel () + : buffer_size(0) +{ +} + +void PortExportChannel::set_max_buffer_size(framecnt_t frames) +{ + buffer_size = frames; + buffer.reset (new Sample[frames]); +} + bool PortExportChannel::operator< (ExportChannel const & other) const { @@ -39,19 +56,29 @@ PortExportChannel::operator< (ExportChannel const & other) const } void -PortExportChannel::read (Sample * data, nframes_t frames) const +PortExportChannel::read (Sample const *& data, framecnt_t frames) const { - memset (data, 0, frames * sizeof (float)); + assert(buffer); + assert(frames <= buffer_size); + + if (ports.size() == 1) { + data = (*ports.begin())->get_audio_buffer(frames).data(); + return; + } + + memset (buffer.get(), 0, frames * sizeof (Sample)); for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) { if (*it != 0) { - Sample* port_buffer = (*it)->get_audio_buffer(frames, 0).data(); - + Sample* port_buffer = (*it)->get_audio_buffer(frames).data(); + for (uint32_t i = 0; i < frames; ++i) { - data[i] += (float) port_buffer[i]; + buffer[i] += (float) port_buffer[i]; } } } + + data = buffer.get(); } void @@ -72,7 +99,13 @@ PortExportChannel::set_state (XMLNode * node, Session & session) XMLNodeList xml_ports = node->children ("Port"); for (XMLNodeList::iterator it = xml_ports.begin(); it != xml_ports.end(); ++it) { if ((prop = (*it)->property ("name"))) { - ports.insert (dynamic_cast (session.engine().get_port_by_name (prop->value()))); + std::string const & name = prop->value(); + AudioPort * port = dynamic_cast (session.engine().get_port_by_name (name)); + if (port) { + ports.insert (port); + } else { + PBD::warning << string_compose (_("Could not get port for export channel \"%1\", dropping the channel"), name) << endmsg; + } } } } @@ -84,10 +117,7 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio frames_per_cycle (session->engine().frames_per_cycle ()), buffers_up_to_date (false), region_start (region.position()), - position (region_start), - - mixdown_buffer (0), - gain_buffer (0) + position (region_start) { switch (type) { case Raw: @@ -95,11 +125,11 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio break; case Fades: n_channels = region.n_channels(); - - mixdown_buffer = new Sample [frames_per_cycle]; - gain_buffer = new Sample [frames_per_cycle]; - memset (gain_buffer, 1.0, sizeof (Sample) * frames_per_cycle); - + + mixdown_buffer.reset (new Sample [frames_per_cycle]); + gain_buffer.reset (new Sample [frames_per_cycle]); + memset (gain_buffer.get(), 1.0, sizeof (Sample) * frames_per_cycle); + break; case Processed: n_channels = track.n_outputs().n_audio(); @@ -107,17 +137,15 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio default: throw ExportFailed ("Unhandled type in ExportChannelFactory constructor"); } - - session->ProcessExport.connect (sigc::hide (sigc::mem_fun (*this, &RegionExportChannelFactory::new_cycle_started))); - - buffers.set_count (ChanCount (DataType::AUDIO, n_channels)); + + 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.set_count (ChanCount (DataType::AUDIO, n_channels)); } RegionExportChannelFactory::~RegionExportChannelFactory () { - delete[] mixdown_buffer; - delete[] gain_buffer; } ExportChannelPtr @@ -128,21 +156,21 @@ RegionExportChannelFactory::create (uint32_t channel) } void -RegionExportChannelFactory::read (uint32_t channel, Sample * data, nframes_t frames_to_read) +RegionExportChannelFactory::read (uint32_t channel, Sample const *& data, framecnt_t frames_to_read) { assert (channel < n_channels); assert (frames_to_read <= frames_per_cycle); - + if (!buffers_up_to_date) { update_buffers(frames_to_read); buffers_up_to_date = true; } - - memcpy (data, buffers.get_audio (channel).data(), frames_to_read * sizeof (Sample)); + + data = buffers.get_audio (channel).data(); } void -RegionExportChannelFactory::update_buffers (nframes_t frames) +RegionExportChannelFactory::update_buffers (framecnt_t frames) { assert (frames <= frames_per_cycle); @@ -155,8 +183,8 @@ RegionExportChannelFactory::update_buffers (nframes_t frames) case Fades: assert (mixdown_buffer && gain_buffer); for (size_t channel = 0; channel < n_channels; ++channel) { - memset (mixdown_buffer, 0, sizeof (Sample) * frames); - region.read_at (buffers.get_audio (channel).data(), mixdown_buffer, gain_buffer, position, frames, 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); } break; case Processed: @@ -165,6 +193,80 @@ RegionExportChannelFactory::update_buffers (nframes_t frames) default: throw ExportFailed ("Unhandled type in ExportChannelFactory::update_buffers"); } - + position += frames; } + + +RouteExportChannel::RouteExportChannel(boost::shared_ptr processor, size_t channel, + boost::shared_ptr remover) + : processor (processor) + , channel (channel) + , remover (remover) +{ +} + +RouteExportChannel::~RouteExportChannel() +{ +} + +void +RouteExportChannel::create_from_route(std::list & result, Route & route) +{ + boost::shared_ptr processor = route.add_export_point(); + uint32_t channels = processor->input_streams().n_audio(); + + boost::shared_ptr remover (new ProcessorRemover (route, processor)); + result.clear(); + for (uint32_t i = 0; i < channels; ++i) { + result.push_back (ExportChannelPtr (new RouteExportChannel (processor, i, remover))); + } +} + +void +RouteExportChannel::set_max_buffer_size(framecnt_t frames) +{ + if (processor) { + processor->set_block_size (frames); + } +} + +void +RouteExportChannel::read (Sample const *& data, framecnt_t frames) const +{ + assert(processor); + AudioBuffer const & buffer = processor->get_capture_buffers().get_audio (channel); + assert (frames <= (framecnt_t) buffer.size()); + data = buffer.data(); +} + +void +RouteExportChannel::get_state (XMLNode * node) const +{ + // TODO +} + +void +RouteExportChannel::set_state (XMLNode * node, Session & session) +{ + // TODO +} + +bool +RouteExportChannel::operator< (ExportChannel const & other) const +{ + RouteExportChannel const * rec; + if ((rec = dynamic_cast(&other)) == 0) { + return this < &other; + } + + if (processor.get() == rec->processor.get()) { + return channel < rec->channel; + } + return processor.get() < rec->processor.get(); +} + +RouteExportChannel::ProcessorRemover::~ProcessorRemover() +{ + route.remove_processor (processor); +}