Use plain git hash for VERSION when there is no exact tag.

[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 6d7286a488970861930e10a17e1271ebacb001b6..bc9bf0d6775d47939c365a66d9040e94a557a2a2 100644 (file)
--- a/src/lib/dcp_content_type.cc
+++ b/src/lib/dcp_content_type.cc
@@ -32,7 +32,7 @@ using boost::optional;
 using namespace std;
 
 
-vector<DCPContentType const *> DCPContentType::_dcp_content_types;
+vector<DCPContentType> DCPContentType::_dcp_content_types;
 
 
 DCPContentType::DCPContentType (string p, dcp::ContentKind k, string d)
@@ -47,19 +47,25 @@ DCPContentType::DCPContentType (string p, dcp::ContentKind k, string d)
 void
 DCPContentType::setup_dcp_content_types ()
 {
+       /// TRANSLATORS: these are the types that a DCP can have, explained in some
+       /// more detail here: https://registry-page.isdcf.com/contenttypes/
        _dcp_content_types = {
-               new DCPContentType(_("Feature"), dcp::ContentKind::FEATURE, N_("FTR")),
-               new DCPContentType(_("Short"), dcp::ContentKind::SHORT, N_("SHR")),
-               new DCPContentType(_("Trailer"), dcp::ContentKind::TRAILER, N_("TLR")),
-               new DCPContentType(_("Test"), dcp::ContentKind::TEST, N_("TST")),
-               new DCPContentType(_("Transitional"), dcp::ContentKind::TRANSITIONAL, N_("XSN")),
-               new DCPContentType(_("Rating"), dcp::ContentKind::RATING, N_("RTG")),
-               new DCPContentType(_("Teaser"), dcp::ContentKind::TEASER, N_("TSR")),
-               new DCPContentType(_("Policy"), dcp::ContentKind::POLICY, N_("POL")),
-               new DCPContentType(_("Public Service Announcement"), dcp::ContentKind::PUBLIC_SERVICE_ANNOUNCEMENT, N_("PSA")),
-               new DCPContentType(_("Advertisement"), dcp::ContentKind::ADVERTISEMENT, N_("ADV")),
-               new DCPContentType(_("Episode"), dcp::ContentKind::EPISODE, N_("EPS")),
-               new DCPContentType(_("Promo"), dcp::ContentKind::PROMO, N_("PRO"))
+               DCPContentType(_("Feature"), dcp::ContentKind::FEATURE, N_("FTR")),
+               DCPContentType(_("Short"), dcp::ContentKind::SHORT, N_("SHR")),
+               DCPContentType(_("Trailer"), dcp::ContentKind::TRAILER, N_("TLR")),
+               DCPContentType(_("Test"), dcp::ContentKind::TEST, N_("TST")),
+               DCPContentType(_("Transitional"), dcp::ContentKind::TRANSITIONAL, N_("XSN")),
+               DCPContentType(_("Rating"), dcp::ContentKind::RATING, N_("RTG")),
+               DCPContentType(_("Teaser"), dcp::ContentKind::TEASER, N_("TSR")),
+               DCPContentType(_("Policy"), dcp::ContentKind::POLICY, N_("POL")),
+               DCPContentType(_("Public Service Announcement"), dcp::ContentKind::PUBLIC_SERVICE_ANNOUNCEMENT, N_("PSA")),
+               DCPContentType(_("Advertisement"), dcp::ContentKind::ADVERTISEMENT, N_("ADV")),
+               DCPContentType(_("Clip"), dcp::ContentKind::CLIP, N_("CLP")),
+               DCPContentType(_("Promo"), dcp::ContentKind::PROMO, N_("PRO")),
+               DCPContentType(_("Stereo card"), dcp::ContentKind::STEREOCARD, N_("STR")),
+               DCPContentType(_("Episode"), dcp::ContentKind::EPISODE, N_("EPS")),
+               DCPContentType(_("Highlights"), dcp::ContentKind::HIGHLIGHTS, N_("HLT")),
+               DCPContentType(_("Event"), dcp::ContentKind::EVENT, N_("EVT")),
        };
 }
 
@@ -67,22 +73,22 @@ DCPContentType::setup_dcp_content_types ()
 DCPContentType const *
 DCPContentType::from_isdcf_name (string n)
 {
-       for (auto i: _dcp_content_types) {
-               if (i->isdcf_name() == n) {
-                       return i;
+       for (auto& i: _dcp_content_types) {
+               if (i.isdcf_name() == n) {
+                       return &i;
                }
        }
 
-       return 0;
+       return nullptr;
 }
 
 
 DCPContentType const *
 DCPContentType::from_libdcp_kind (dcp::ContentKind kind)
 {
-       for (auto i: _dcp_content_types) {
-               if (i->libdcp_kind() == kind) {
-                       return i;
+       for (auto& i: _dcp_content_types) {
+               if (i.libdcp_kind() == kind) {
+                       return &i;
                }
        }
 
@@ -95,15 +101,15 @@ DCPContentType const *
 DCPContentType::from_index (int n)
 {
        DCPOMATIC_ASSERT (n >= 0 && n < int(_dcp_content_types.size()));
-       return _dcp_content_types[n];
+       return &_dcp_content_types[n];
 }
 
 
 optional<int>
 DCPContentType::as_index (DCPContentType const * c)
 {
-       vector<DCPContentType*>::size_type i = 0;
-       while (i < _dcp_content_types.size() && _dcp_content_types[i] != c) {
+       vector<DCPContentType>::size_type i = 0;
+       while (i < _dcp_content_types.size() && &_dcp_content_types[i] != c) {
                ++i;
        }
 
@@ -118,5 +124,9 @@ DCPContentType::as_index (DCPContentType const * c)
 vector<DCPContentType const *>
 DCPContentType::all ()
 {
-       return _dcp_content_types;
+       vector<DCPContentType const *> raw;
+       for (auto& type: _dcp_content_types) {
+               raw.push_back (&type);
+       }
+       return raw;
 }