Partial hacks to use of libdcp 1.0.

[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 2b6e60a19cb902b701b9075c5797d34f28f575f5..09d22b8f75eb6eb18b76954f99607c2ae9b98cc4 100644 (file)
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_DCP_CONTENT_TYPE_H
-#define DVDOMATIC_DCP_CONTENT_TYPE_H
+#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,17 +31,17 @@
 /** @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;
        }
 
@@ -50,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 ();
@@ -57,7 +58,7 @@ public:
 
 private:
        std::string _pretty_name;
-       libdcp::ContentKind _libdcp_kind;
+       dcp::ContentKind _libdcp_kind;
        std::string _dci_name;
 
        /** All available DCP content types */