Merge 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 b703970a3c7fb6811a3a31f3a051e0296398d51d..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.)
  */
@@ -47,6 +50,7 @@ public:
        }
 
        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 ();
@@ -61,3 +65,4 @@ private:
        static std::vector<DCPContentType const *> _dcp_content_types;
 };
      
+#endif