X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content_type.h;h=f08db883a867ba17ff2772e389ce7761389200d7;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=f45bbb9f87808bed7a8fe5a0d5241943dedb81fe;hpb=b249700e1da7dd6631a8b4440587f4093a2bdef1;p=dcpomatic.git

diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index f45bbb9f8..f08db883a 100644
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -28,6 +28,7 @@
  */
 
 
+#include <dcp/content_kind.h>
 #include <dcp/dcp.h>
 #include <string>
 #include <vector>
@@ -41,9 +42,6 @@ class DCPContentType
 public:
 	DCPContentType (std::string, dcp::ContentKind, std::string);
 
-	DCPContentType (DCPContentType const&) = delete;
-	DCPContentType& operator= (DCPContentType const&) = delete;
-
 	/** @return user-visible `pretty' name */
 	std::string pretty_name () const {
 		return _pretty_name;
@@ -60,7 +58,7 @@ public:
 	static DCPContentType const * from_isdcf_name (std::string);
 	static DCPContentType const * from_libdcp_kind (dcp::ContentKind);
 	static DCPContentType const * from_index (int);
-	static int as_index (DCPContentType const *);
+	static boost::optional<int> as_index (DCPContentType const *);
 	static std::vector<DCPContentType const *> all ();
 	static void setup_dcp_content_types ();
 
@@ -70,7 +68,7 @@ private:
 	std::string _isdcf_name;
 
 	/** All available DCP content types */
-	static std::vector<DCPContentType const *> _dcp_content_types;
+	static std::vector<DCPContentType> _dcp_content_types;
 };