Include tidying src/lib/a-j*.h

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

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index b707754a78957bc2e3291659fc01c3e4d84606fe..f0f1e321a1f322396f3eb7af4484a304edf8da5d 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include "compose.hpp"
 #include <dcp/dcp.h>
 #include <dcp/exceptions.h>
+#include <libxml++/libxml++.h>
 #include <iterator>
 
 #include "i18n.h"
@@ -32,16 +33,18 @@
 using std::string;
 using std::cout;
 using std::distance;
+using std::pair;
+using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
 int const DCPContentProperty::CAN_BE_PLAYED = 600;
 
-DCPContent::DCPContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f)
-       , VideoContent (f)
-       , SingleStreamAudioContent (f)
-       , SubtitleContent (f)
+DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film)
+       , VideoContent (film)
+       , SingleStreamAudioContent (film)
+       , SubtitleContent (film)
        , _has_subtitles (false)
        , _encrypted (false)
        , _kdm_valid (false)
@@ -51,11 +54,11 @@ DCPContent::DCPContent (shared_ptr<const Film> f, boost::filesystem::path p)
        unset_colour_conversion (false);
 }
 
-DCPContent::DCPContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-       : Content (f, node)
-       , VideoContent (f, node, version)
-       , SingleStreamAudioContent (f, node, version)
-       , SubtitleContent (f, node, version)
+DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+       : Content (film, node)
+       , VideoContent (film, node, version)
+       , SingleStreamAudioContent (film, node, version)
+       , SubtitleContent (film, node, version)
 {
        _name = node->string_child ("Name");
        _has_subtitles = node->bool_child ("HasSubtitles");
@@ -82,10 +85,10 @@ void
 DCPContent::examine (shared_ptr<Job> job)
 {
        bool const could_be_played = can_be_played ();
-               
+
        job->set_progress_unknown ();
        Content::examine (job);
-       
+
        shared_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this ()));
        take_from_video_examiner (examiner);
        take_from_audio_examiner (examiner);
@@ -144,7 +147,7 @@ DCPContent::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 (rint (video_length () * frc.factor ()), film->video_frame_rate ());
+       return DCPTime::from_frames (llrint (video_length () * frc.factor ()), film->video_frame_rate ());
 }
 
 string
@@ -181,3 +184,9 @@ DCPContent::directory () const
 
        return dir;
 }
+
+void
+DCPContent::add_properties (list<pair<string, string> >& p) const
+{
+       SingleStreamAudioContent::add_properties (p);
+}