X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fresampler.cc;h=4476d9f1f9b2220cab1160ae876246e301a49661;hp=faf07e2a712d974c6d73da3247ab433c4edf6a8e;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=5ccb7323be3b7d7011d42de6f9843b3a813c7964

diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index faf07e2a7..4476d9f1f 100644
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,6 +24,7 @@
 #include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include <samplerate.h>
+#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -32,6 +34,7 @@ using std::pair;
 using std::make_pair;
 using std::runtime_error;
 using boost::shared_ptr;
+using boost::make_shared;
 
 /** @param in Input sampling rate (Hz)
  *  @param out Output sampling rate (Hz)
@@ -61,7 +64,7 @@ Resampler::run (shared_ptr<const AudioBuffers> in)
 	int in_frames = in->frames ();
 	int in_offset = 0;
 	int out_offset = 0;
-	shared_ptr<AudioBuffers> resampled (new AudioBuffers (_channels, 0));
+	shared_ptr<AudioBuffers> resampled = make_shared<AudioBuffers> (_channels, 0);
 
 	while (in_frames > 0) {
 
@@ -135,16 +138,12 @@ Resampler::run (shared_ptr<const AudioBuffers> in)
 shared_ptr<const AudioBuffers>
 Resampler::flush ()
 {
-	shared_ptr<AudioBuffers> out (new AudioBuffers (_channels, 0));
+	shared_ptr<AudioBuffers> out = make_shared<AudioBuffers> (_channels, 0);
 	int out_offset = 0;
 	int64_t const output_size = 65536;
 
-	/* I think this should only need to be 1 long, but I have seen
-	   src_process error with "input and output data arrays overlap"
-	   with dummy[1] (on OS X).  I've added a few more for luck.
-	*/
-	float dummy[16];
-	float buffer[output_size];
+	float dummy[1];
+	float* buffer = new float[output_size];
 
 	SRC_DATA data;
 	data.data_in = dummy;
@@ -156,6 +155,7 @@ Resampler::flush ()
 
 	int const r = src_process (_src, &data);
 	if (r) {
+		delete[] buffer;
 		throw EncodeError (String::compose (N_("could not run sample-rate converter (%1)"), src_strerror (r)));
 	}
 
@@ -172,5 +172,6 @@ Resampler::flush ()
 	out_offset += data.output_frames_gen;
 	out->set_frames (out_offset);
 
+	delete[] buffer;
 	return out;
 }