X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content_type.cc;h=bc9bf0d6775d47939c365a66d9040e94a557a2a2;hp=e1b05852cf8c0e614fcfb74d5a5754101ae4c85f;hb=3476d6760f1efe3e8d51ba5ae535b38af9cf955a;hpb=28111007e2e6fd62f5810be780706ae1618bd33f

diff --git a/src/lib/dcp_content_type.cc b/src/lib/dcp_content_type.cc
index e1b05852c..bc9bf0d67 100644
--- a/src/lib/dcp_content_type.cc
+++ b/src/lib/dcp_content_type.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,9 +27,13 @@
 
 #include "i18n.h"
 
+
+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)
 	: _pretty_name (p)
@@ -39,73 +43,90 @@ DCPContentType::DCPContentType (string p, dcp::ContentKind k, string d)
 
 }
 
+
 void
 DCPContentType::setup_dcp_content_types ()
 {
-	_dcp_content_types.push_back (new DCPContentType(_("Feature"), dcp::ContentKind::FEATURE, N_("FTR")));
-	_dcp_content_types.push_back (new DCPContentType(_("Short"), dcp::ContentKind::SHORT, N_("SHR")));
-	_dcp_content_types.push_back (new DCPContentType(_("Trailer"), dcp::ContentKind::TRAILER, N_("TLR")));
-	_dcp_content_types.push_back (new DCPContentType(_("Test"), dcp::ContentKind::TEST, N_("TST")));
-	_dcp_content_types.push_back (new DCPContentType(_("Transitional"), dcp::ContentKind::TRANSITIONAL, N_("XSN")));
-	_dcp_content_types.push_back (new DCPContentType(_("Rating"), dcp::ContentKind::RATING, N_("RTG")));
-	_dcp_content_types.push_back (new DCPContentType(_("Teaser"), dcp::ContentKind::TEASER, N_("TSR")));
-	_dcp_content_types.push_back (new DCPContentType(_("Policy"), dcp::ContentKind::POLICY, N_("POL")));
-	_dcp_content_types.push_back (new DCPContentType(_("Public Service Announcement"), dcp::ContentKind::PUBLIC_SERVICE_ANNOUNCEMENT, N_("PSA")));
-	_dcp_content_types.push_back (new DCPContentType(_("Advertisement"), dcp::ContentKind::ADVERTISEMENT, N_("ADV")));
-	_dcp_content_types.push_back (new DCPContentType(_("Episode"), dcp::ContentKind::EPISODE, N_("EPS")));
-	_dcp_content_types.push_back (new DCPContentType(_("Promo"), dcp::ContentKind::PROMO, N_("PRO")));
+	/// 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 = {
+		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")),
+	};
 }
 
+
 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;
 		}
 	}
 
 	DCPOMATIC_ASSERT (false);
-	return 0;
+	return nullptr;
 }
 
 
 DCPContentType const *
 DCPContentType::from_index (int n)
 {
-	DCPOMATIC_ASSERT (n >= 0 && n < int (_dcp_content_types.size ()));
-	return _dcp_content_types[n];
+	DCPOMATIC_ASSERT (n >= 0 && n < int(_dcp_content_types.size()));
+	return &_dcp_content_types[n];
 }
 
-int
+
+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;
 	}
 
-	if (i == _dcp_content_types.size ()) {
-		return -1;
+	if (i == _dcp_content_types.size()) {
+		return {};
 	}
 
 	return i;
 }
 
+
 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;
 }