X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_channel.cc;h=2ccaf1ae33cd3f208c83f3e2c74c2c8f0a3b19cf;hb=0a6eed2b33c7abbfdd5fac6448fbfe495c8f5dda;hp=8c5a7e4abefe1368a1d367c2f3416abb40752eea;hpb=0cca2724311b8df9989dc46efad12bdbe05c3883;p=ardour.git

diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index 8c5a7e4abe..2ccaf1ae33 100644
--- a/libs/ardour/export_channel.cc
+++ b/libs/ardour/export_channel.cc
@@ -113,7 +113,7 @@ PortExportChannel::set_state (XMLNode * node, Session & session)
 	}
 }
 
-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)
@@ -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,11 +187,12 @@ 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, track.main_outs(), true, true);
+		track.export_stuff (buffers, position, frames, track.main_outs(), true, true, false);
 		break;
 	default:
 		throw ExportFailed ("Unhandled type in ExportChannelFactory::update_buffers");
@@ -242,7 +243,7 @@ RouteExportChannel::read (Sample const *& data, framecnt_t frames) const
 #ifndef NDEBUG
 	(void) frames;
 #else
-	assert (frames <= (framecnt_t) buffer.size());
+	assert (frames <= (framecnt_t) buffer.capacity());
 #endif
 	data = buffer.data();
 }