X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content_type.h;h=ff10933e0bedd88b376e1f2baaecf53519478670;hb=cc0ac806a2dc698d9c20b24498bc865e2d9798ad;hp=05f30af5515d5c4ad1cd5713fb59d6200164a562;hpb=09806bc8d6a48fc79d923ec1cdf6f90176bf8b6a;p=dcpomatic.git

diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index 05f30af55..ff10933e0 100644
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -20,13 +20,13 @@
 #ifndef DCPOMATIC_DCP_CONTENT_TYPE_H
 #define DCPOMATIC_DCP_CONTENT_TYPE_H
 
-/** @file src/content_type.h
- *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
+/** @file src/dcp_content_type.h
+ *  @brief DCPContentType class.
  */
 
+#include <dcp/dcp.h>
 #include <string>
 #include <vector>
-#include <dcp/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,10 +59,10 @@ 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;
 };
-     
+
 #endif