X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content_type.h;h=2685e6edfd20b8857060ef1735fae36c74160754;hp=14204bd722b6d167e5234e09e88eb331b97362ef;hb=HEAD;hpb=147cca5876dfbdf56e21289c3a36bec4b4850191

diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index 14204bd72..f08db883a 100644
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -1,32 +1,38 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #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/content_kind.h>
+#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.)
@@ -34,35 +40,36 @@
 class DCPContentType
 {
 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_dci_name (std::string);
+	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 ();
 
 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;
+	static std::vector<DCPContentType> _dcp_content_types;
 };
-     
+
+
 #endif