X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content_type.h;h=ebfe09518a5577189e745d05d0a37bfd6d1ce04c;hb=5e4f001bf32e3cdf65efa34803d70e6c1c00c66b;hp=b703970a3c7fb6811a3a31f3a051e0296398d51d;hpb=13511ed2fcc23f4d5f9c507c775c3c5cfd82d155;p=dcpomatic.git

diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index b703970a3..ebfe09518 100644
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -17,36 +17,40 @@
 
 */
 
+#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.)
  */
 
 #include <string>
 #include <vector>
-#include <libdcp/dcp.h>
+#include <dcp/dcp.h>
 
 /** @class DCPContentType
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
  */
-class DCPContentType
+class DCPContentType : public boost::noncopyable
 {
 public:
-	DCPContentType (std::string, libdcp::ContentKind, std::string);
+	DCPContentType (std::string, dcp::ContentKind, std::string);
 
 	/** @return user-visible `pretty' name */
 	std::string pretty_name () const {
 		return _pretty_name;
 	}
 
-	libdcp::ContentKind libdcp_kind () const {
+	dcp::ContentKind libdcp_kind () const {
 		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_isdcf_name (std::string);
 	static DCPContentType const * from_index (int);
 	static int as_index (DCPContentType const *);
 	static std::vector<DCPContentType const *> all ();
@@ -54,10 +58,11 @@ public:
 
 private:
 	std::string _pretty_name;
-	libdcp::ContentKind _libdcp_kind;
-	std::string _dci_name;
+	dcp::ContentKind _libdcp_kind;
+	std::string _isdcf_name;
 
 	/** All available DCP content types */
 	static std::vector<DCPContentType const *> _dcp_content_types;
 };
      
+#endif