X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_channel.cc;h=8ea01f3ec3c424b583a6ee0834a1f257d30c3559;hb=f6d29abfc75c460b9e35717f2907e4e61bf38058;hp=583dc9a843201fda68f660808a1b448e45993eea;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 583dc9a843..8ea01f3ec3 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -22,12 +22,29 @@ #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,31 @@ 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) { + boost::shared_ptr p = ports.begin()->lock (); + data = p->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(); + boost::shared_ptr p = it->lock (); + if (p) { + Sample* port_buffer = p->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 @@ -59,8 +88,9 @@ PortExportChannel::get_state (XMLNode * node) const { XMLNode * port_node; for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) { - if ((port_node = node->add_child ("Port"))) { - port_node->add_property ("name", (*it)->name()); + boost::shared_ptr p = it->lock (); + if (p && (port_node = node->add_child ("Port"))) { + port_node->add_property ("name", p->name()); } } } @@ -72,22 +102,25 @@ 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(); + boost::shared_ptr port = boost::dynamic_pointer_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; + } } } } -RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type) : - region (region), - track (track), - type (type), - 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) +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 ()) + , buffers_up_to_date (false) + , region_start (region.position()) + , position (region_start) { switch (type) { case Raw: @@ -96,9 +129,9 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio 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]); + std::fill_n (gain_buffer.get(), frames_per_cycle, Sample (1.0)); break; case Processed: @@ -108,16 +141,14 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio throw ExportFailed ("Unhandled type in ExportChannelFactory constructor"); } - session->ProcessExport.connect (sigc::hide (sigc::mem_fun (*this, &RegionExportChannelFactory::new_cycle_started))); + session->ProcessExport.connect_same_thread (export_connection, boost::bind (&RegionExportChannelFactory::new_cycle_started, this, _1)); - buffers.set_count (ChanCount (DataType::AUDIO, n_channels)); 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,7 +159,7 @@ 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); @@ -138,11 +169,11 @@ RegionExportChannelFactory::read (uint32_t channel, Sample * data, nframes_t fra 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,16 +186,95 @@ 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); + buffers.get_audio (channel).silence(frames); + region.read_at (buffers.get_audio (channel).data(), mixdown_buffer.get(), gain_buffer.get(), position, frames, channel); } break; - case Processed: - track.export_stuff (buffers, position, frames); + case Processed: + track.export_stuff (buffers, position, frames, track.main_outs(), true, true); break; - default: + 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, boost::shared_ptr 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); +#ifndef NDEBUG + (void) frames; +#else + assert (frames <= (framecnt_t) buffer.capacity()); +#endif + data = buffer.data(); +} + +void +RouteExportChannel::get_state (XMLNode *) const +{ + // TODO +} + +void +RouteExportChannel::set_state (XMLNode *, 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); +}