merge (squash) with scenechange topic branch to provide MIDI-driven scene change...

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

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