Rename Server -> EncodeServer, ServerFinder -> EncodeServerFinder, ServerDescription...

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

diff --git a/src/lib/dcp_subtitle.cc b/src/lib/dcp_subtitle.cc
index 66cee4ad866f9772e8cdc96e75dc696a66ac9c14..be64937809765486e8bbed8689476d1e1375726c 100644 (file)
--- a/src/lib/dcp_subtitle.cc
+++ b/src/lib/dcp_subtitle.cc
@@ -30,24 +30,16 @@ shared_ptr<dcp::SubtitleAsset>
 DCPSubtitle::load (boost::filesystem::path file) const
 {
        shared_ptr<dcp::SubtitleAsset> sc;
-       
+
        try {
                sc.reset (new dcp::InteropSubtitleAsset (file));
        } catch (...) {
-               
-       }
 
-       if (!sc) {
-               try {
-                       sc.reset (new dcp::SMPTESubtitleAsset (file, true));
-               } catch (...) {
-
-               }
        }
 
        if (!sc) {
                try {
-                       sc.reset (new dcp::SMPTESubtitleAsset (file, false));
+                       sc.reset (new dcp::SMPTESubtitleAsset (file));
                } catch (...) {
 
                }