X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fdcp_subtitle.cc;h=be64937809765486e8bbed8689476d1e1375726c;hb=5b3e3df6c9352e31dd932a5af215eabbf2cf27c8;hp=17874c27eca9520f50a3bee4a2c2e12d812a095b;hpb=8af00f5e0862c18e8c7b5f9ac0ea95a5d6ad696c;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle.cc b/src/lib/dcp_subtitle.cc
index 17874c27e..be6493780 100644
--- a/src/lib/dcp_subtitle.cc
+++ b/src/lib/dcp_subtitle.cc
@@ -19,35 +19,27 @@
 
 #include "dcp_subtitle.h"
 #include "exceptions.h"
-#include <dcp/interop_subtitle_content.h>
-#include <dcp/smpte_subtitle_content.h>
+#include <dcp/interop_subtitle_asset.h>
+#include <dcp/smpte_subtitle_asset.h>
 
 #include "i18n.h"
 
 using boost::shared_ptr;
 
-shared_ptr<dcp::SubtitleContent>
+shared_ptr<dcp::SubtitleAsset>
 DCPSubtitle::load (boost::filesystem::path file) const
 {
-	shared_ptr<dcp::SubtitleContent> sc;
-	
+	shared_ptr<dcp::SubtitleAsset> sc;
+
 	try {
-		sc.reset (new dcp::InteropSubtitleContent (file));
+		sc.reset (new dcp::InteropSubtitleAsset (file));
 	} catch (...) {
-		
-	}
 
-	if (!sc) {
-		try {
-			sc.reset (new dcp::SMPTESubtitleContent (file, true));
-		} catch (...) {
-
-		}
 	}
 
 	if (!sc) {
 		try {
-			sc.reset (new dcp::SMPTESubtitleContent (file, false));
+			sc.reset (new dcp::SMPTESubtitleAsset (file));
 		} catch (...) {
 
 		}