X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content_type.h;h=34398009bcaa24fb00bd4fe7e47d82fe6ac8af28;hb=a5e87b6f0f496f4ed71d9129d40a5baebb68495f;hp=09d22b8f75eb6eb18b76954f99607c2ae9b98cc4;hpb=f58d9e44302151dea9f594acd9fc27a331fa77fb;p=dcpomatic.git

diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index 09d22b8f7..34398009b 100644
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -24,9 +24,9 @@
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
  */
 
+#include <dcp/dcp.h>
 #include <string>
 #include <vector>
-#include <libdcp/dcp.h>
 
 /** @class DCPContentType
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
@@ -45,12 +45,12 @@ public:
 		return _libdcp_kind;
 	}
 
-	std::string dci_name () const {
-		return _dci_name;
+	std::string isdcf_name () const {
+		return _isdcf_name;
 	}
 
 	static DCPContentType const * from_pretty_name (std::string);
-	static DCPContentType const * from_dci_name (std::string);
+	static DCPContentType const * from_isdcf_name (std::string);
 	static DCPContentType const * from_index (int);
 	static int as_index (DCPContentType const *);
 	static std::vector<DCPContentType const *> all ();
@@ -59,7 +59,7 @@ public:
 private:
 	std::string _pretty_name;
 	dcp::ContentKind _libdcp_kind;
-	std::string _dci_name;
+	std::string _isdcf_name;
 
 	/** All available DCP content types */
 	static std::vector<DCPContentType const *> _dcp_content_types;