X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fratio.cc;h=5f1a3aa63d31a98a9b6afa441e86d84140b6f455;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=eae12b061ca0dd04e9692d3cd85eb5e28dd00dd5;hpb=9458457504af5548bc51b3c29e65dbe92fd0513d;p=dcpomatic.git

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index eae12b061..5f1a3aa63 100644
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,34 +18,54 @@
 
 */
 
+
 #include "ratio.h"
 #include "util.h"
+#include "config.h"
 #include <dcp/types.h>
 #include <cfloat>
 
 #include "i18n.h"
 
+
 using std::string;
 using std::vector;
 using boost::optional;
 
-vector<Ratio const *> Ratio::_ratios;
+
+vector<Ratio> Ratio::_ratios;
+
 
 void
 Ratio::setup_ratios ()
 {
-	_ratios.push_back (new Ratio (float(1290) / 1080, "119", _("1.19"),              optional<string>(),      "119"));
-	_ratios.push_back (new Ratio (float(1440) / 1080, "133", _("1.33 (4:3)"),        optional<string>(),      "133"));
-	_ratios.push_back (new Ratio (float(1485) / 1080, "138", _("1.38 (Academy)"),    optional<string>(),      "137"));
-	_ratios.push_back (new Ratio (float(1544) / 1080, "143", _("1.43 (IMAX)"),       optional<string>(),      "143"));
-	_ratios.push_back (new Ratio (float(1800) / 1080, "166", _("1.66"),              optional<string>(),      "166"));
-	_ratios.push_back (new Ratio (float(1920) / 1080, "178", _("1.78 (16:9 or HD)"), optional<string>(),      "178"));
-	_ratios.push_back (new Ratio (float(1998) / 1080, "185", _("1.85 (Flat)"),       string(_("DCI Flat")),   "F"));
-	_ratios.push_back (new Ratio (float(2048) /  872, "235", _("2.35 (35mm Scope)"), optional<string>(),      "S"));
-	_ratios.push_back (new Ratio (float(2048) /  858, "239", _("2.39 (Scope)"),      string(_("DCI Scope")),  "S"));
-	_ratios.push_back (new Ratio (float(2048) / 1080, "190", _("1.90 (Full frame)"), string(_("Full frame")), "C"));
+	/* This must only be called once as we rely on the addresses of objects in _ratios staying the same */
+	DCPOMATIC_ASSERT (_ratios.empty());
+
+	_ratios.push_back (Ratio(float(1290) / 1080, "119", _("1.19"),              {},                      "119"));
+	_ratios.push_back (Ratio(float(1440) / 1080, "133", _("1.33 (4:3)"),        {},                      "133"));
+	_ratios.push_back (Ratio(float(1485) / 1080, "138", _("1.38 (Academy)"),    {},                      "137"));
+	_ratios.push_back (Ratio(float(1544) / 1080, "143", _("1.43 (IMAX)"),       {},                      "143"));
+	_ratios.push_back (Ratio(float(1800) / 1080, "166", _("1.66"),              {},                      "166"));
+	_ratios.push_back (Ratio(float(1920) / 1080, "178", _("1.78 (16:9 or HD)"), {},                      "178"));
+	_ratios.push_back (Ratio(float(1998) / 1080, "185", _("1.85 (Flat)"),       string(_("DCI Flat")),   "F"));
+	_ratios.push_back (Ratio(float(2048) /  872, "235", _("2.35 (35mm Scope)"), {},                      "S"));
+	_ratios.push_back (Ratio(float(2048) /  858, "239", _("2.39 (Scope)"),      string(_("DCI Scope")),  "S"));
+	_ratios.push_back (Ratio(float(2048) / 1080, "190", _("1.90 (Full frame)"), string(_("Full frame")), "C"));
+}
+
+
+vector<Ratio const *>
+Ratio::all ()
+{
+	vector<Ratio const *> pointers;
+	for (Ratio& ratio: _ratios) {
+		pointers.push_back (&ratio);
+	}
+	return pointers;
 }
 
+
 Ratio const *
 Ratio::from_id (string i)
 {
@@ -54,64 +74,78 @@ Ratio::from_id (string i)
 		i = "138";
 	}
 
-	vector<Ratio const *>::iterator j = _ratios.begin ();
-	while (j != _ratios.end() && (*j)->id() != i) {
+	auto j = _ratios.begin ();
+	while (j != _ratios.end() && j->id() != i) {
 		++j;
 	}
 
-	if (j == _ratios.end ()) {
-		return 0;
+	if (j == _ratios.end()) {
+		return nullptr;
 	}
 
-	return *j;
+	return &(*j);
 }
 
+
 /** @return Ratio corresponding to a given fractional ratio (+/- 0.01), or 0 */
 Ratio const *
 Ratio::from_ratio (float r)
 {
-	vector<Ratio const *>::iterator j = _ratios.begin ();
-	while (j != _ratios.end() && fabs ((*j)->ratio() - r) > 0.01) {
+	auto j = _ratios.begin ();
+	while (j != _ratios.end() && fabs(j->ratio() - r) > 0.01) {
 		++j;
 	}
 
 	if (j == _ratios.end ()) {
-		return 0;
+		return nullptr;
 	}
 
-	return *j;
+	return &(*j);
 }
 
+
 Ratio const *
 Ratio::nearest_from_ratio (float r)
 {
-	Ratio const * nearest = 0;
+	vector<Ratio>::const_iterator nearest = _ratios.end();
 	float distance = FLT_MAX;
 
-	for (vector<Ratio const *>::iterator i = _ratios.begin (); i != _ratios.end(); ++i) {
-		float const d = fabs ((*i)->ratio() - r);
+	for (auto i = _ratios.begin(); i != _ratios.end(); ++i) {
+		float const d = fabs(i->ratio() - r);
 		if (d < distance) {
 			distance = d;
-			nearest = *i;
+			nearest = i;
 		}
 	}
 
-	return nearest;
+	DCPOMATIC_ASSERT (nearest != _ratios.end());
+
+	return &(*nearest);
 }
 
 vector<Ratio const *>
 Ratio::containers ()
 {
+	if (Config::instance()->allow_any_container()) {
+		return all();
+	}
+
 	vector<Ratio const *> r;
 	r.push_back (Ratio::from_id ("185"));
 	r.push_back (Ratio::from_id ("239"));
-	r.push_back (Ratio::from_id ("190"));
 	return r;
 }
 
+
 string
 Ratio::container_nickname () const
 {
-	DCPOMATIC_ASSERT (_container_nickname);
+	if (!_container_nickname) {
+		/* Fall back to the image nickname; this just for when non-standard container
+		   ratios are enabled.
+		*/
+		return _image_nickname;
+	}
+
 	return *_container_nickname;
 }