Fix merge.

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

diff --git a/src/lib/dcp_content_type.cc b/src/lib/dcp_content_type.cc
index 03712cb0de7a5272b4de0393cbc37c8feb6af85d..aae80530831228d7440e6b2f06dade0af5a81033 100644 (file)
--- a/src/lib/dcp_content_type.cc
+++ b/src/lib/dcp_content_type.cc
@@ -28,9 +28,10 @@ using namespace std;
 
 vector<DCPContentType const *> DCPContentType::_dcp_content_types;
 
-DCPContentType::DCPContentType (string p, libdcp::DCP::ContentType c)
+DCPContentType::DCPContentType (string p, libdcp::ContentKind k, string d)
        : _pretty_name (p)
-       , _libdcp_type (c)
+       , _libdcp_kind (k)
+       , _dci_name (d)
 {
 
 }
@@ -38,16 +39,16 @@ DCPContentType::DCPContentType (string p, libdcp::DCP::ContentType c)
 void
 DCPContentType::setup_dcp_content_types ()
 {
-       _dcp_content_types.push_back (new DCPContentType ("Feature", libdcp::DCP::FEATURE));
-       _dcp_content_types.push_back (new DCPContentType ("Short", libdcp::DCP::SHORT));
-       _dcp_content_types.push_back (new DCPContentType ("Trailer", libdcp::DCP::TRAILER));
-       _dcp_content_types.push_back (new DCPContentType ("Test", libdcp::DCP::TEST));
-       _dcp_content_types.push_back (new DCPContentType ("Transitional", libdcp::DCP::TRANSITIONAL));
-       _dcp_content_types.push_back (new DCPContentType ("Rating", libdcp::DCP::RATING));
-       _dcp_content_types.push_back (new DCPContentType ("Teaser", libdcp::DCP::TEASER));
-       _dcp_content_types.push_back (new DCPContentType ("Policy", libdcp::DCP::POLICY));
-       _dcp_content_types.push_back (new DCPContentType ("Public Service Announcement", libdcp::DCP::PUBLIC_SERVICE_ANNOUNCEMENT));
-       _dcp_content_types.push_back (new DCPContentType ("Advertisement", libdcp::DCP::ADVERTISEMENT));
+       _dcp_content_types.push_back (new DCPContentType ("Feature", libdcp::FEATURE, "FTR"));
+       _dcp_content_types.push_back (new DCPContentType ("Short", libdcp::SHORT, "SHR"));
+       _dcp_content_types.push_back (new DCPContentType ("Trailer", libdcp::TRAILER, "TLR"));
+       _dcp_content_types.push_back (new DCPContentType ("Test", libdcp::TEST, "TST"));
+       _dcp_content_types.push_back (new DCPContentType ("Transitional", libdcp::TRANSITIONAL, "XSN"));
+       _dcp_content_types.push_back (new DCPContentType ("Rating", libdcp::RATING, "RTG"));
+       _dcp_content_types.push_back (new DCPContentType ("Teaser", libdcp::TEASER, "TSR"));
+       _dcp_content_types.push_back (new DCPContentType ("Policy", libdcp::POLICY, "POL"));
+       _dcp_content_types.push_back (new DCPContentType ("Public Service Announcement", libdcp::PUBLIC_SERVICE_ANNOUNCEMENT, "PSA"));
+       _dcp_content_types.push_back (new DCPContentType ("Advertisement", libdcp::ADVERTISEMENT, "ADV"));
 }
 
 DCPContentType const *