Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;

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

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index 79a1d49999acf8849fb007a68e0188ad29d81dff..7a336f88af632d3770eeed3beb3f9cd82b0915e7 100644 (file)
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -19,12 +19,17 @@
 
 #include "subrip_content.h"
 #include "util.h"
+#include "subrip.h"
+#include "film.h"
+#include <dcp/raw_convert.h>
 
 #include "i18n.h"
 
-using std::stringstream;
 using std::string;
+using std::cout;
+using dcp::raw_convert;
 using boost::shared_ptr;
+using boost::lexical_cast;
 
 SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
@@ -33,17 +38,27 @@ SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::pa
 
 }
 
-SubRipContent::SubRipContent (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version)
+SubRipContent::SubRipContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
-       , SubtitleContent (film, node)
+       , SubtitleContent (film, node, version)
+       , _length (node->number_child<DCPTime::Type> ("Length"))
 {
 
 }
 
 void
-SubRipContent::examine (boost::shared_ptr<Job>)
+SubRipContent::examine (boost::shared_ptr<Job> job, bool calculate_digest)
 {
+       Content::examine (job, calculate_digest);
+       SubRip s (shared_from_this ());
 
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
+       
+       DCPTime len (s.length (), film->active_frame_rate_change (position ()));
+
+       boost::mutex::scoped_lock lm (_mutex);
+       _length = len;
 }
 
 string
@@ -61,33 +76,23 @@ SubRipContent::technical_summary () const
 string
 SubRipContent::information () const
 {
-       
+
 }
        
 void
-SubRipContent::as_xml (xmlpp::Node* node)
+SubRipContent::as_xml (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text ("SubRip");
        Content::as_xml (node);
        SubtitleContent::as_xml (node);
+       node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }
 
-Time
+DCPTime
 SubRipContent::full_length () const
 {
-
-}
-
-string
-SubRipContent::identifier () const
-{
-       LocaleGuard lg;
-
-       stringstream s;
-       s << Content::identifier()
-         << "_" << subtitle_scale()
-         << "_" << subtitle_offset();
-
-       return s.str ();
+       /* XXX: this assumes that the timing of the SubRip file is appropriate
+          for the DCP's frame rate.
+       */
+       return _length;
 }
-