Merge 1.0 and some subtitling fixes.

[dcpomatic.git] / src / lib / decoded.h

diff --git a/src/lib/decoded.h b/src/lib/decoded.h
index a9b9227691c0ee258c1a3053fc6c26b6b85560da..1de2ff79e5222e76156c368f10f263e3c3cf158a 100644 (file)
--- a/src/lib/decoded.h
+++ b/src/lib/decoded.h
@@ -94,13 +94,12 @@ public:
                , dcp_time_to (0)
        {}
 
-       /* XXX: content/dcp time here */
-       DecodedSubtitle (boost::shared_ptr<Image> im, dcpomatic::Rect<double> r, DCPTime f, DCPTime t)
+       DecodedSubtitle (boost::shared_ptr<Image> im, dcpomatic::Rect<double> r, ContentTime f, ContentTime t)
                : Decoded (f)
                , image (im)
                , rect (r)
                , content_time_to (t)
-               , dcp_time_to (t)
+               , dcp_time_to (0)
        {}
 
        void set_dcp_times (float speed_up, DCPTime offset) {