diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-01 01:25:01 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-01 01:25:01 +0200 |
| commit | 0a1aa72f11b7d5109caaa5d3ae0068e18dea6b56 (patch) | |
| tree | 904cbc6325dc998514ff2a0e5a494a135f7876bc /src | |
| parent | 86646e17164f7e085bae1574ecda5784ce9a67ac (diff) | |
C++11 cleanup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/butler.cc | 4 | ||||
| -rw-r--r-- | src/lib/ffmpeg_encoder.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/butler.cc b/src/lib/butler.cc index d4da787dd..37e8c9544 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -307,7 +307,7 @@ void Butler::prepare (weak_ptr<PlayerVideo> weak_video) try { - shared_ptr<PlayerVideo> video = weak_video.lock (); + auto video = weak_video.lock (); /* If the weak_ptr cannot be locked the video obviously no longer requires any work */ if (video) { LOG_TIMING("start-prepare in %1", thread_id()); @@ -363,7 +363,7 @@ Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time, int frame_rate) optional<DCPTime> Butler::get_audio (float* out, Frame frames) { - optional<DCPTime> t = _audio.get (out, _audio_channels, frames); + auto t = _audio.get (out, _audio_channels, frames); _summon.notify_all (); return t; } diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 5f29b64da..fc0d5eab2 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -181,7 +181,7 @@ FFmpegEncoder::go () if (!v.first) { throw DecodeError(String::compose("Error during decoding: %1", e.summary())); } - shared_ptr<FFmpegFileEncoder> fe = encoder->get (v.first->eyes()); + auto fe = encoder->get (v.first->eyes()); if (fe) { fe->video(v.first, v.second); } @@ -194,7 +194,7 @@ FFmpegEncoder::go () _last_time = i; } - shared_ptr<Job> job = _job.lock (); + auto job = _job.lock (); if (job) { job->set_progress (float(i.get()) / _film->length().get()); } |