Untested merge of master.

[dcpomatic.git] / src / lib / dcp_content_type.h

diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index cb858cf5a34975a169fcef5dc72b37c9fc438a2b..14204bd722b6d167e5234e09e88eb331b97362ef 100644 (file)
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -17,6 +17,9 @@
 
 */
 
+#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.)
  */
@@ -31,7 +34,7 @@
 class DCPContentType
 {
 public:
-       DCPContentType (std::string, libdcp::ContentKind);
+       DCPContentType (std::string, libdcp::ContentKind, std::string);
 
        /** @return user-visible `pretty' name */
        std::string pretty_name () const {
@@ -42,7 +45,12 @@ public:
                return _libdcp_kind;
        }
 
+       std::string dci_name () const {
+               return _dci_name;
+       }
+
        static DCPContentType const * from_pretty_name (std::string);
+       static DCPContentType const * from_dci_name (std::string);
        static DCPContentType const * from_index (int);
        static int as_index (DCPContentType const *);
        static std::vector<DCPContentType const *> all ();
@@ -51,8 +59,10 @@ public:
 private:
        std::string _pretty_name;
        libdcp::ContentKind _libdcp_kind;
+       std::string _dci_name;
 
        /** All available DCP content types */
        static std::vector<DCPContentType const *> _dcp_content_types;
 };
      
+#endif