X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_channel.cc;h=2ccaf1ae33cd3f208c83f3e2c74c2c8f0a3b19cf;hb=bc487bb4b02a9780938d6cf8528c888e59161aa9;hp=296bfc9022493ada07e2d2a03e41de1fc9c8e59c;hpb=b880a381523b2cfdb7ebd17c27fff1adf90fa028;p=ardour.git diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 296bfc9022..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) @@ -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(); }