From a8a0dfd1b21de6c0facf965ab119833ff6f790bf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 21 Jun 2016 23:08:53 +0100 Subject: Revert "Use make_shared<>." Support for this seems to vary wildly across DoM's build targets. Stuff that builds on 16.04 won't build on 14.04, for example. Seems to not be worth the hassle now. This reverts commit 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f. --- src/lib/resampler.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/lib/resampler.cc') diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc index 4476d9f1f..db5552d15 100644 --- a/src/lib/resampler.cc +++ b/src/lib/resampler.cc @@ -24,7 +24,6 @@ #include "compose.hpp" #include "dcpomatic_assert.h" #include -#include #include #include "i18n.h" @@ -34,7 +33,6 @@ 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) @@ -64,7 +62,7 @@ Resampler::run (shared_ptr in) int in_frames = in->frames (); int in_offset = 0; int out_offset = 0; - shared_ptr resampled = make_shared (_channels, 0); + shared_ptr resampled (new AudioBuffers (_channels, 0)); while (in_frames > 0) { @@ -138,7 +136,7 @@ Resampler::run (shared_ptr in) shared_ptr Resampler::flush () { - shared_ptr out = make_shared (_channels, 0); + shared_ptr out (new AudioBuffers (_channels, 0)); int out_offset = 0; int64_t const output_size = 65536; -- cgit v1.2.3