fix crash when copy'ing latent plugins

[ardour.git] / libs / ardour / export_channel.cc

diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index 82e5d80244ff21d63f40277addc117822aef5c0d..cc388531df32fb96cb10a3ca9965f0bffb5d73dd 100644 (file)
--- 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,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");
@@ -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();
 }