C++11 tweaks.

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 85c65763f146e12ac31f1b18dea24b1ceac8c74c..0e70d9c6f89350f12e5e1ffba1573f2d3af5aed2 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -125,7 +125,7 @@ FFmpeg::setup_general ()
        }
        _format_context->pb = _avio_context;
 
-       AVDictionary* options = 0;
+       AVDictionary* options = nullptr;
        int e = avformat_open_input (&_format_context, 0, 0, &options);
        if (e < 0) {
                throw OpenFileError (_ffmpeg_content->path(0).string(), e, OpenFileError::READ);
@@ -141,7 +141,7 @@ FFmpeg::setup_general ()
 
 DCPOMATIC_DISABLE_WARNINGS
        for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
-               AVStream* s = _format_context->streams[i];
+               auto s = _format_context->streams[i];
                if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO && avcodec_find_decoder(s->codec->codec_id)) {
                        if (s->avg_frame_rate.num > 0 && s->avg_frame_rate.den > 0) {
                                /* This is definitely our video stream */
@@ -201,12 +201,12 @@ FFmpeg::setup_decoders ()
 
 DCPOMATIC_DISABLE_WARNINGS
        for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
-               AVCodecContext* context = _format_context->streams[i]->codec;
+               auto context = _format_context->streams[i]->codec;
 
                AVCodec* codec = avcodec_find_decoder (context->codec_id);
                if (codec) {
 
-                       AVDictionary* options = 0;
+                       AVDictionary* options = nullptr;
                        /* This option disables decoding of DCA frame footers in our patched version
                           of FFmpeg.  I believe these footers are of no use to us, and they can cause
                           problems when FFmpeg fails to decode them (mantis #352).
@@ -234,7 +234,7 @@ AVCodecContext *
 FFmpeg::video_codec_context () const
 {
        if (!_video_stream) {
-               return 0;
+               return nullptr;
        }
 
        return _format_context->streams[_video_stream.get()]->codec;
@@ -244,7 +244,7 @@ AVCodecContext *
 FFmpeg::subtitle_codec_context () const
 {
        if (!_ffmpeg_content->subtitle_stream ()) {
-               return 0;
+               return nullptr;
        }
 
        return _ffmpeg_content->subtitle_stream()->stream(_format_context)->codec;
@@ -270,7 +270,7 @@ FFmpeg::avio_seek (int64_t const pos, int whence)
 FFmpegSubtitlePeriod
 FFmpeg::subtitle_period (AVSubtitle const & sub)
 {
-       ContentTime const packet_time = ContentTime::from_seconds (static_cast<double> (sub.pts) / AV_TIME_BASE);
+       auto const packet_time = ContentTime::from_seconds (static_cast<double> (sub.pts) / AV_TIME_BASE);
 
        if (sub.end_display_time == static_cast<uint32_t> (-1)) {
                /* End time is not known */
@@ -289,7 +289,7 @@ FFmpeg::subtitle_period (AVSubtitle const & sub)
  *  in FFmpeg.
  */
 ContentTime
-FFmpeg::pts_offset (vector<shared_ptr<FFmpegAudioStream> > audio_streams, optional<ContentTime> first_video, double video_frame_rate) const
+FFmpeg::pts_offset (vector<shared_ptr<FFmpegAudioStream>> audio_streams, optional<ContentTime> first_video, double video_frame_rate) const
 {
        /* Audio and video frame PTS values may not start with 0.  We want
           to fiddle them so that:
@@ -307,7 +307,7 @@ FFmpeg::pts_offset (vector<shared_ptr<FFmpegAudioStream> > audio_streams, option
 
        /* First, make one of them start at 0 */
 
-       ContentTime po = ContentTime::min ();
+       auto po = ContentTime::min ();
 
        if (first_video) {
                po = - first_video.get ();
@@ -329,7 +329,7 @@ FFmpeg::pts_offset (vector<shared_ptr<FFmpegAudioStream> > audio_streams, option
 
        /* Now adjust so that the video pts starts on a frame */
        if (first_video) {
-               ContentTime const fvc = first_video.get() + po;
+               auto const fvc = first_video.get() + po;
                po += fvc.ceil (video_frame_rate) - fvc;
        }
 

diff --git a/src/lib/timer.cc b/src/lib/timer.cc
index e4e7bdfdc391a412f4ef0d4c25f5c1ada4e7404c..8e4d44547f5e6dd1799c3c1b3b9eeb4d4b4efd54 100644 (file)
--- a/src/lib/timer.cc
+++ b/src/lib/timer.cc
@@ -113,24 +113,24 @@ StateTimer::~StateTimer ()
        unset ();
 
        int longest = 0;
-       for (map<string, Counts>::iterator i = _counts.begin(); i != _counts.end(); ++i) {
-               longest = max (longest, int(i->first.length()));
+       for (auto const& i: _counts) {
+               longest = max (longest, int(i.first.length()));
        }
 
        list<pair<double, string> > sorted;
 
-       for (map<string, Counts>::iterator i = _counts.begin(); i != _counts.end(); ++i) {
-               string name = i->first + string(longest + 1 - i->first.size(), ' ');
+       for (auto const& i: _counts) {
+               string name = i.first + string(longest + 1 - i.first.size(), ' ');
                char buffer[64];
-               snprintf (buffer, 64, "%.4f", i->second.total_time);
+               snprintf (buffer, 64, "%.4f", i.second.total_time);
                string total_time (buffer);
-               sorted.push_back (make_pair(i->second.total_time, String::compose("\t%1%2 %3 %4", name, total_time, i->second.number, (i->second.total_time / i->second.number))));
+               sorted.push_back (make_pair(i.second.total_time, String::compose("\t%1%2 %3 %4", name, total_time, i.second.number, (i.second.total_time / i.second.number))));
        }
 
        sorted.sort (compare);
 
        cout << _name << N_(":\n");
-       for (list<pair<double, string> >::iterator i = sorted.begin(); i != sorted.end(); ++i) {
-               cout << N_("\t") << i->second << "\n";
+       for (auto const& i: sorted) {
+               cout << N_("\t") << i.second << "\n";
        }
 }

diff --git a/src/lib/timer.h b/src/lib/timer.h
index bd4e652f811cfe04d254e252f680973e5c2ed2c7..44724ee026e28e0188b68a507fb00dc0462437d6 100644 (file)
--- a/src/lib/timer.h
+++ b/src/lib/timer.h
@@ -74,13 +74,8 @@ public:
        class Counts
        {
        public:
-               Counts ()
-                       : total_time (0)
-                       , number (0)
-               {}
-
-               double total_time;
-               int number;
+               double total_time = 0;
+               int number = 0;
        };
 
        std::map<std::string, Counts> counts () const {