X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_channel.cc;h=5435d63c5294e18d8cd1f0b9f340f098be2ab8f9;hb=9992ea10b35caacc2f061cd176d0dc3910eb7453;hp=936b0f8a625f148230fe2c5ac7143186fd79e852;hpb=110311e1860d6fb18b1985ca47f33126ae69f678;p=ardour.git

diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index 936b0f8a62..5435d63c52 100644
--- a/libs/ardour/export_channel.cc
+++ b/libs/ardour/export_channel.cc
@@ -30,7 +30,7 @@
 
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 
@@ -62,15 +62,21 @@ PortExportChannel::read (Sample const *& data, framecnt_t frames) const
 	assert(frames <= buffer_size);
 
 	if (ports.size() == 1) {
-		data = (*ports.begin())->get_audio_buffer(frames).data();
+		boost::shared_ptr<AudioPort> p = ports.begin()->lock ();
+		AudioBuffer& ab (p->get_audio_buffer(frames)); // unsets AudioBuffer::_written
+		data = ab.data();
+		ab.set_written (true);
 		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).data();
+		boost::shared_ptr<AudioPort> p = it->lock ();
+		if (p) {
+			AudioBuffer& ab (p->get_audio_buffer(frames)); // unsets AudioBuffer::_written
+			Sample* port_buffer = ab.data();
+			ab.set_written (true);
 
 			for (uint32_t i = 0; i < frames; ++i) {
 				buffer[i] += (float) port_buffer[i];
@@ -86,8 +92,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<Port> p = it->lock ();
+		if (p && (port_node = node->add_child ("Port"))) {
+			port_node->set_property ("name", p->name());
 		}
 	}
 }
@@ -95,12 +102,11 @@ PortExportChannel::get_state (XMLNode * node) const
 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();
-			AudioPort * port = dynamic_cast<AudioPort *> (session.engine().get_port_by_name (name));
+		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);
 			} else {
@@ -110,14 +116,14 @@ PortExportChannel::set_state (XMLNode * node, Session & session)
 	}
 }
 
-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)
+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:
@@ -128,7 +134,7 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio
 
 		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);
+		std::fill_n (gain_buffer.get(), frames_per_cycle, Sample (1.0));
 
 		break;
 	  case Processed:
@@ -184,13 +190,14 @@ RegionExportChannelFactory::update_buffers (framecnt_t frames)
 		assert (mixdown_buffer && gain_buffer);
 		for (size_t channel = 0; channel < n_channels; ++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, false);
 		break;
-	  default:
+	default:
 		throw ExportFailed ("Unhandled type in ExportChannelFactory::update_buffers");
 	}
 
@@ -211,9 +218,9 @@ RouteExportChannel::~RouteExportChannel()
 }
 
 void
-RouteExportChannel::create_from_route(std::list<ExportChannelPtr> & result, Route & route)
+RouteExportChannel::create_from_route(std::list<ExportChannelPtr> & result, boost::shared_ptr<Route> route)
 {
-	boost::shared_ptr<CapturingProcessor> processor = route.add_export_point();
+	boost::shared_ptr<CapturingProcessor> processor = route->add_export_point();
 	uint32_t channels = processor->input_streams().n_audio();
 
 	boost::shared_ptr<ProcessorRemover> remover (new ProcessorRemover (route, processor));
@@ -236,18 +243,22 @@ 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());
+#ifndef NDEBUG
+	(void) frames;
+#else
+	assert (frames <= (framecnt_t) buffer.capacity());
+#endif
 	data = buffer.data();
 }
 
 void
-RouteExportChannel::get_state (XMLNode * node) const
+RouteExportChannel::get_state (XMLNode *) const
 {
 	// TODO
 }
 
 void
-RouteExportChannel::set_state (XMLNode * node, Session & session)
+RouteExportChannel::set_state (XMLNode *, Session &)
 {
 	// TODO
 }
@@ -268,5 +279,5 @@ RouteExportChannel::operator< (ExportChannel const & other) const
 
 RouteExportChannel::ProcessorRemover::~ProcessorRemover()
 {
-	route.remove_processor (processor);
+	route->remove_processor (processor);
 }