Clean up a bit by using Content::film() more.

[dcpomatic.git] / src / lib / ffmpeg_content.cc

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 84e474a4b44ec7c23a16fd4a1115ff25c766a1bc..a317ec35fee91ad4d45c7668b9bca6e06e7dcda0 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -42,7 +42,7 @@ extern "C" {
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
 using std::string;
 using std::vector;
@@ -187,9 +187,6 @@ FFmpegContent::examine (shared_ptr<Job> job)
        shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
        take_from_video_examiner (examiner);
 
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-
        {
                boost::mutex::scoped_lock lm (_mutex);
 
@@ -202,7 +199,7 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
                if (!_audio_streams.empty ()) {
                        AudioMapping m = _audio_streams.front()->mapping ();
-                       film->make_audio_mapping_default (m);
+                       film()->make_audio_mapping_default (m);
                        _audio_streams.front()->set_mapping (m);
                }
 
@@ -280,10 +277,8 @@ operator!= (FFmpegStream const & a, FFmpegStream const & b)
 DCPTime
 FFmpegContent::full_length () const
 {
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       FrameRateChange const frc (video_frame_rate (), film->video_frame_rate ());
-       return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor()), film->video_frame_rate());
+       FrameRateChange const frc (video_frame_rate (), film()->video_frame_rate ());
+       return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
 }
 
 void
@@ -376,12 +371,18 @@ FFmpegContent::add_properties (list<pair<string, string> >& p) const
 
                switch (_color_range) {
                case AVCOL_RANGE_UNSPECIFIED:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is unknown (not specified in the file).
                        p.push_back (make_pair (_("Colour range"), _("Unspecified")));
                        break;
                case AVCOL_RANGE_MPEG:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is limited, so that not all possible values are valid.
                        p.push_back (make_pair (_("Colour range"), String::compose (_("Limited (%1-%2)"), (total - sub) / 2, (total + sub) / 2)));
                        break;
                case AVCOL_RANGE_JPEG:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is full, so that all possible pixel values are valid.
                        p.push_back (make_pair (_("Colour range"), String::compose (_("Full (0-%1)"), total)));
                        break;
                default:
@@ -390,12 +391,18 @@ FFmpegContent::add_properties (list<pair<string, string> >& p) const
        } else {
                switch (_color_range) {
                case AVCOL_RANGE_UNSPECIFIED:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is unknown (not specified in the file).
                        p.push_back (make_pair (_("Colour range"), _("Unspecified")));
                        break;
                case AVCOL_RANGE_MPEG:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is limited, so that not all possible values are valid.
                        p.push_back (make_pair (_("Colour range"), _("Limited")));
                        break;
                case AVCOL_RANGE_JPEG:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is full, so that all possible pixel values are valid.
                        p.push_back (make_pair (_("Colour range"), _("Full")));
                        break;
                default: