Fix subtitle timing under trim.

[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..b7bf8d81ad14f6b48c8165aff7163854e19b3def 100644 (file)
--- a/src/lib/dcp_content_type.cc
+++ b/src/lib/dcp_content_type.cc
@@ -21,16 +21,20 @@
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
  */
 
-#include <cassert>
 #include "dcp_content_type.h"
+#include "dcpomatic_assert.h"
+#include <cassert>
+
+#include "i18n.h"
 
 using namespace std;
 
 vector<DCPContentType const *> DCPContentType::_dcp_content_types;
 
-DCPContentType::DCPContentType (string p, libdcp::DCP::ContentType c)
+DCPContentType::DCPContentType (string p, dcp::ContentKind k, string d)
        : _pretty_name (p)
-       , _libdcp_type (c)
+       , _libdcp_kind (k)
+       , _isdcf_name (d)
 {
 
 }
@@ -38,16 +42,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"), dcp::FEATURE, N_("FTR")));
+       _dcp_content_types.push_back (new DCPContentType (_("Short"), dcp::SHORT, N_("SHR")));
+       _dcp_content_types.push_back (new DCPContentType (_("Trailer"), dcp::TRAILER, N_("TLR")));
+       _dcp_content_types.push_back (new DCPContentType (_("Test"), dcp::TEST, N_("TST")));
+       _dcp_content_types.push_back (new DCPContentType (_("Transitional"), dcp::TRANSITIONAL, N_("XSN")));
+       _dcp_content_types.push_back (new DCPContentType (_("Rating"), dcp::RATING, N_("RTG")));
+       _dcp_content_types.push_back (new DCPContentType (_("Teaser"), dcp::TEASER, N_("TSR")));
+       _dcp_content_types.push_back (new DCPContentType (_("Policy"), dcp::POLICY, N_("POL")));
+       _dcp_content_types.push_back (new DCPContentType (_("Public Service Announcement"), dcp::PUBLIC_SERVICE_ANNOUNCEMENT, N_("PSA")));
+       _dcp_content_types.push_back (new DCPContentType (_("Advertisement"), dcp::ADVERTISEMENT, N_("ADV")));
 }
 
 DCPContentType const *
@@ -62,10 +66,22 @@ DCPContentType::from_pretty_name (string n)
        return 0;
 }
 
+DCPContentType const *
+DCPContentType::from_isdcf_name (string n)
+{
+       for (vector<DCPContentType const *>::const_iterator i = _dcp_content_types.begin(); i != _dcp_content_types.end(); ++i) {
+               if ((*i)->isdcf_name() == n) {
+                       return *i;
+               }
+       }
+
+       return 0;
+}
+
 DCPContentType const *
 DCPContentType::from_index (int n)
 {
-       assert (n >= 0 && n < int (_dcp_content_types.size ()));
+       DCPOMATIC_ASSERT (n >= 0 && n < int (_dcp_content_types.size ()));
        return _dcp_content_types[n];
 }