Hand-apply 2ee558ec90623b570360e8e55c918b5bb37f9aac from master; various snapping...

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

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index c1f0ab500bd54962a8780133181e04426462c0d2..e3c06378b8eabd86216d8f08394e1db57152fab6 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -17,18 +17,19 @@
 
 */
 
-#include <dcp/subtitle_content.h>
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
+#include <dcp/interop_subtitle_content.h>
 
 using std::list;
+using std::cout;
 using boost::shared_ptr;
 
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
        : SubtitleDecoder (content)
 {
-       dcp::SubtitleContent c (content->path (0), false);
-       _subtitles = c.subtitles ();
+       shared_ptr<dcp::SubtitleContent> c (load (content->path (0)));
+       _subtitles = c->subtitles ();
        _next = _subtitles.begin ();
 }
 
@@ -55,7 +56,7 @@ DCPSubtitleDecoder::pass ()
        s.push_back (*_next);
        text_subtitle (s);
        ++_next;
-       
+
        return false;
 }