New DCPTime/ContentTime types.

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

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index aecee4e3e7aaceb4290dccf75aaa7a79674f2bc8..6ebb883230849676f07b56527d2b18c26433bf0a 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include <dcp/subtitle_string.h>
 #include "subrip_decoder.h"
 
 using std::list;
@@ -38,21 +39,21 @@ SubRipDecoder::pass ()
                return true;
        }
        
-       list<libdcp::Subtitle> out;
+       list<dcp::SubtitleString> out;
        for (list<SubRipSubtitlePiece>::const_iterator i = _subtitles[_next].pieces.begin(); i != _subtitles[_next].pieces.end(); ++i) {
                out.push_back (
-                       libdcp::Subtitle (
+                       dcp::SubtitleString (
                                "Arial",
                                i->italic,
-                               libdcp::Color (255, 255, 255),
+                               dcp::Color (255, 255, 255),
                                72,
-                               _subtitles[_next].from,
-                               _subtitles[_next].to,
+                               dcp::Time (rint (_subtitles[_next].from.seconds() * 250)),
+                               dcp::Time (rint (_subtitles[_next].to.seconds() * 250)),
                                0.9,
-                               libdcp::BOTTOM,
+                               dcp::BOTTOM,
                                i->text,
-                               libdcp::NONE,
-                               libdcp::Color (255, 255, 255),
+                               dcp::NONE,
+                               dcp::Color (255, 255, 255),
                                0,
                                0
                                )