Use dcp::compose rather than our own.

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

diff --git a/src/lib/types.cc b/src/lib/types.cc
index b7632a9842a07afb6315b63ca64aef0699893f3d..9e87481591273b2b0dd60de3691f48afe58d9fd1 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -19,10 +19,10 @@
 */
 
 #include "types.h"
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include "warnings.h"
 #include <dcp/raw_convert.h>
+#include <dcp/compose.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel_file_asset.h>
@@ -112,7 +112,7 @@ string_to_text_type (string s)
        } else if (s == "closed-caption") {
                return TextType::CLOSED_CAPTION;
        } else {
-               throw MetadataError (String::compose ("Unknown text type %1", s));
+               throw MetadataError (dcp::compose ("Unknown text type %1", s));
        }
 }
 
@@ -214,7 +214,7 @@ CPLSummary::CPLSummary (boost::filesystem::path p)
        encrypted = false;
        for (auto j: dcp.cpls()) {
                for (auto k: j->reel_file_assets()) {
-                       if (k->key_id()) {
+                       if (k->encrypted()) {
                                encrypted = true;
                        }
                }