X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fresampler.cc;h=60eb7f5052a3e5ca4e47a14f850a83f762f75a05;hp=01d71c79b68219caefff036363336eb5e23a55f6;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=5b04f870694373ad9c6086aed5ab38b0c6b41ccc

diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index 01d71c79b..60eb7f505 100644
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -33,7 +33,7 @@ using std::cout;
 using std::pair;
 using std::make_pair;
 using std::runtime_error;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** @param in Input sampling rate (Hz)
  *  @param out Output sampling rate (Hz)
@@ -53,13 +53,17 @@ Resampler::Resampler (int in, int out, int channels)
 
 Resampler::~Resampler ()
 {
-	src_delete (_src);
+	if (_src) {
+		src_delete (_src);
+	}
 }
 
 void
 Resampler::set_fast ()
 {
 	src_delete (_src);
+	_src = 0;
+
 	int error;
 	_src = src_new (SRC_LINEAR, _channels, &error);
 	if (!_src) {
@@ -118,6 +122,8 @@ Resampler::run (shared_ptr<const AudioBuffers> in)
 		}
 
 		if (data.output_frames_gen == 0) {
+			delete[] data.data_in;
+			delete[] data.data_out;
 			break;
 		}
 
@@ -185,3 +191,9 @@ Resampler::flush ()
 	delete[] buffer;
 	return out;
 }
+
+void
+Resampler::reset ()
+{
+	src_reset (_src);
+}