X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fratio.cc;h=5ba79c28b7a8f48ad826a4f33ba608fc98dc4e69;hp=29c22c78deadde5d6517a4574192359384f97ce5;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index 29c22c78d..5ba79c28b 100644
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -1,52 +1,66 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #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;
 
+
 void
 Ratio::setup_ratios ()
 {
-	_ratios.push_back (new Ratio (float(1290) / 1080, "119", _("1.19"), "119"));
-	_ratios.push_back (new Ratio (float(1440) / 1080, "133", _("4:3"), "133"));
-	_ratios.push_back (new Ratio (float(1480) / 1080, "137", _("Academy"), "137"));
-	_ratios.push_back (new Ratio (float(1485) / 1080, "138", _("1.375"), "137"));
-	_ratios.push_back (new Ratio (float(1800) / 1080, "166", _("1.66"), "166"));
-	_ratios.push_back (new Ratio (float(1920) / 1080, "178", _("16:9"), "178"));
-	_ratios.push_back (new Ratio (float(1998) / 1080, "185", _("Flat"), "F"));
-	_ratios.push_back (new Ratio (float(2048) /  858, "239", _("Scope"), "S"));
-	_ratios.push_back (new Ratio (float(2048) / 1080, "full-frame", _("Full frame"), "C"));
+	_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"));
 }
 
+
 Ratio const *
 Ratio::from_id (string i)
 {
-	vector<Ratio const *>::iterator j = _ratios.begin ();
+	/* We removed the ratio with id 137; replace it with 138 */
+	if (i == "137") {
+		i = "138";
+	}
+
+	auto j = _ratios.begin ();
 	while (j != _ratios.end() && (*j)->id() != i) {
 		++j;
 	}
@@ -58,30 +72,32 @@ Ratio::from_id (string i)
 	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;
 }
-   
+
+
 Ratio const *
 Ratio::nearest_from_ratio (float r)
 {
-	Ratio const * nearest = 0;
+	Ratio const * nearest = nullptr;
 	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;
@@ -90,3 +106,30 @@ Ratio::nearest_from_ratio (float r)
 
 	return nearest;
 }
+
+vector<Ratio const *>
+Ratio::containers ()
+{
+	if (Config::instance()->allow_any_container()) {
+		return _ratios;
+	}
+
+	vector<Ratio const *> r;
+	r.push_back (Ratio::from_id ("185"));
+	r.push_back (Ratio::from_id ("239"));
+	return r;
+}
+
+
+string
+Ratio::container_nickname () const
+{
+	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;
+}