Bump libdcp for better ContentKind support, and libsub

[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 03a52e57ce00053a0d122b2a9eee93566e22128a..f08db883a867ba17ff2772e389ce7761389200d7 100644 (file)
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -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;
@@ -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;
 };