diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-05-26 09:46:21 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-05-26 09:46:21 +0200 |
| commit | fb0e2ead59a442700c671270c7d57b5bffeaeab3 (patch) | |
| tree | fc7e85a6f5f2d0034cb83b5cb70db1eb5d32bdd8 /src/lib | |
| parent | 7cb0939d582003e2a419a337cfd092525ada3309 (diff) | |
Cleanup: use some more make_shared.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/audio_filter.cc | 2 | ||||
| -rw-r--r-- | src/lib/audio_merger.h | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.cc | 2 | ||||
| -rw-r--r-- | src/lib/writer.cc | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/audio_filter.cc b/src/lib/audio_filter.cc index ed4657328..2b4c44083 100644 --- 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 07e730ce2..a6b7637f6 100644 --- 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 62242d65c..9189c3e83 100644 --- 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 3aca2ab89..6e3821aa7 100644 --- 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 (); } |