diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-12 10:06:59 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-12 10:06:59 -0500 |
commit | 1676789907b95aa8d5bf6cc2ce62aa66a80b9aae (patch) | |
tree | 7c84f3eb9a4d400a26f29461d40bd50ba32ae8d4 /libs/ardour/export_channel.cc | |
parent | 88732abd0177f9ee9f4be780e3ffe724ef798c64 (diff) | |
parent | fd1eb73ef21e8a938e34ca49378a866c381c48e3 (diff) |
fix merge conflicts from master
Diffstat (limited to 'libs/ardour/export_channel.cc')
-rw-r--r-- | libs/ardour/export_channel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 8c5a7e4abe..296bfc9022 100644 --- 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: |