Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index 8f9c28e293c15bfe9335e0f9f7fe9bc24edca1de..14cb50b86718eb3a25e0a3516a5cea9f823261e1 100644 (file)
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -25,7 +25,6 @@
 
 #include "i18n.h"
 
-using std::stringstream;
 using std::string;
 using std::cout;
 using dcp::raw_convert;
@@ -39,10 +38,10 @@ 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, version)
-       , _length (node->number_child<int64_t> ("Length"))
+       , _length (node->number_child<DCPTime::Type> ("Length"))
 {
 
 }
@@ -77,7 +76,7 @@ SubRipContent::technical_summary () const
 string
 SubRipContent::information () const
 {
-       
+
 }
        
 void
@@ -97,15 +96,3 @@ SubRipContent::full_length () const
        */
        return _length;
 }
-
-string
-SubRipContent::identifier () const
-{
-       stringstream s;
-       s << Content::identifier()
-         << "_" << raw_convert<string> (subtitle_scale())
-         << "_" << raw_convert<string> (subtitle_x_offset())
-         << "_" << raw_convert<string> (subtitle_y_offset());
-
-       return s.str ();
-}