From: Carl Hetherington <cth@carlh.net>
Date: Mon, 15 Dec 2014 13:59:15 +0000 (+0000)
Subject: Modify for new libdcp API.
X-Git-Tag: v2.0.48~396
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=784b55d18f4bddddd49fdb62475638336dcdcb21

Modify for new libdcp API.
---

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 798afbfc3..85c28d038 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -18,7 +18,7 @@
 */
 
 #include "dcp_subtitle_content.h"
-#include <dcp/subtitle_content.h>
+#include <dcp/interop_subtitle_content.h>
 #include <dcp/raw_convert.h>
 
 #include "i18n.h"
@@ -47,7 +47,7 @@ void
 DCPSubtitleContent::examine (shared_ptr<Job> job, bool calculate_digest)
 {
 	Content::examine (job, calculate_digest);
-	dcp::SubtitleContent sc (path (0), false);
+	dcp::InteropSubtitleContent sc (path (0));
 	_subtitle_language = sc.language ();
 	_length = DCPTime::from_seconds (sc.latest_subtitle_out().to_seconds ());
 }
diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index f61c69a7b..2a9b52869 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -19,7 +19,7 @@
 
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
-#include <dcp/subtitle_content.h>
+#include <dcp/interop_subtitle_content.h>
 
 using std::list;
 using std::cout;
@@ -28,7 +28,7 @@ using boost::shared_ptr;
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
 	: SubtitleDecoder (content)
 {
-	dcp::SubtitleContent c (content->path (0), false);
+	dcp::InteropSubtitleContent c (content->path (0));
 	_subtitles = c.subtitles ();
 	_next = _subtitles.begin ();
 }