Cleanup: use some more make_shared.

diff --git a/src/lib/audio_filter.cc b/src/lib/audio_filter.cc
index ed4657328374f63e0055c79431891f631fa7c9ed..2b4c440834738dc023a32c1513684a8a4e97731c 100644 (file)
--- a/src/lib/audio_filter.cc
+++ b/src/lib/audio_filter.cc
@@ -80,7 +80,7 @@ AudioFilter::run (shared_ptr<const AudioBuffers> in)
        auto out = make_shared<AudioBuffers>(in->channels(), in->frames());
 
        if (!_tail) {
-               _tail.reset (new AudioBuffers (in->channels(), _M + 1));
+               _tail = make_shared<AudioBuffers>(in->channels(), _M + 1);
                _tail->make_silent ();
        }
 

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 07e730ce2048164fe658d8e1fa155462b9457d25..a6b7637f6aca07e696cbed77a8f5cff1a3ddc711 100644 (file)
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -52,7 +52,7 @@ private:
                 *  @param r Frame rate.
                 */
                Buffer (int c, int32_t f, dcpomatic::DCPTime t, int r)
-                       : audio (new AudioBuffers (c, f))
+                       : audio (std::make_shared<AudioBuffers>(c, f))
                        , time (t)
                        , frame_rate (r)
                {}

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 62242d65c2a582d438f0827b67ec02290d58213b..9189c3e8347d8403d077a27448d0178c4543a7be 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -271,7 +271,7 @@ FFmpegFileEncoder::FFmpegFileEncoder (
                throw EncodeError (N_("avformat_write_header"), N_("FFmpegFileEncoder::FFmpegFileEncoder"), r);
        }
 
-       _pending_audio.reset (new AudioBuffers(channels, 0));
+       _pending_audio = make_shared<AudioBuffers>(channels, 0);
 }
 
 

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 3aca2ab89c96328445907dbbd88ae64156b722ac..6e3821aa7c7d7d94ea624ced4fb637e2a653c7da 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -303,12 +303,12 @@ Writer::write (shared_ptr<const AudioBuffers> audio, DCPTime const time)
                        DCPOMATIC_ASSERT ((part_frames[0] + part_frames[1]) <= audio->frames());
 
                        if (part_frames[0]) {
-                               shared_ptr<AudioBuffers> part (new AudioBuffers(audio, part_frames[0], 0));
+                               auto part = make_shared<AudioBuffers>(audio, part_frames[0], 0);
                                _audio_reel->write (part);
                        }
 
                        if (part_frames[1]) {
-                               audio.reset (new AudioBuffers(audio, part_frames[1], part_frames[0]));
+                               audio = make_shared<AudioBuffers>(audio, part_frames[1], part_frames[0]);
                        } else {
                                audio.reset ();
                        }

diff --git a/test/audio_ring_buffers_test.cc b/test/audio_ring_buffers_test.cc
index 95927537fbe45ed91b9559ebd6ed86808b2e6c53..6efd8fbf8e58c9ba34def776881b0a75d4fedc22 100644 (file)
--- a/test/audio_ring_buffers_test.cc
+++ b/test/audio_ring_buffers_test.cc
@@ -23,6 +23,7 @@
 #include <iostream>
 
 using std::cout;
+using std::make_shared;
 using std::shared_ptr;
 using namespace dcpomatic;
 
@@ -58,7 +59,7 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test1)
        BOOST_CHECK_EQUAL (buffer[240 * 6], CANARY);
 
        /* Put some data in */
-       shared_ptr<AudioBuffers> data (new AudioBuffers (6, 91));
+       auto data = make_shared<AudioBuffers>(6, 91);
        int value = 0;
        for (int i = 0; i < 91; ++i) {
                for (int j = 0; j < 6; ++j) {
@@ -99,7 +100,7 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test2)
        AudioRingBuffers rb;
 
        /* Put some data in */
-       shared_ptr<AudioBuffers> data (new AudioBuffers (2, 91));
+       auto data = make_shared<AudioBuffers>(2, 91);
        int value = 0;
        for (int i = 0; i < 91; ++i) {
                for (int j = 0; j < 2; ++j) {
@@ -151,7 +152,7 @@ BOOST_AUTO_TEST_CASE (audio_ring_buffers_test3)
        AudioRingBuffers rb;
 
        /* Put some data in */
-       shared_ptr<AudioBuffers> data (new AudioBuffers (6, 91));
+       auto data = make_shared<AudioBuffers>(6, 91);
        int value = 0;
        for (int i = 0; i < 91; ++i) {
                for (int j = 0; j < 6; ++j) {