X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_channel.cc;h=cc388531df32fb96cb10a3ca9965f0bffb5d73dd;hb=6946bdc0830c9f0971d2cd0d54b27e343c54d96a;hp=8f83c0a7fb9c32524d55fcb319363767e484c9f5;hpb=7bdcc127e3e42bd76b997b56ecd938b1127d790b;p=ardour.git

diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index 8f83c0a7fb..cc388531df 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;
 
@@ -98,7 +98,7 @@ PortExportChannel::get_state (XMLNode * node) const
 void
 PortExportChannel::set_state (XMLNode * node, Session & session)
 {
-	XMLProperty * prop;
+	XMLProperty const * prop;
 	XMLNodeList xml_ports = node->children ("Port");
 	for (XMLNodeList::iterator it = xml_ports.begin(); it != xml_ports.end(); ++it) {
 		if ((prop = (*it)->property ("name"))) {
@@ -113,14 +113,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:
@@ -131,7 +131,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:
@@ -187,13 +187,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");
 	}
 
@@ -214,9 +215,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));
@@ -239,7 +240,11 @@ 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();
 }
 
@@ -271,5 +276,5 @@ RouteExportChannel::operator< (ExportChannel const & other) const
 
 RouteExportChannel::ProcessorRemover::~ProcessorRemover()
 {
-	route.remove_processor (processor);
+	route->remove_processor (processor);
 }