X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fratio.cc;h=89efc987d4cc8fa8f600b8ed9aed47d8a2dca4f3;hp=fc36415c50638e161e73c8bd1df1ed19d3e01e99;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=7979aeb87a83de31c4cf25f88eef4fbca4b56553

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index fc36415c5..89efc987d 100644
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -1,25 +1,27 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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 <dcp/types.h>
 #include "ratio.h"
 #include "util.h"
+#include <dcp/types.h>
+#include <cfloat>
 
 #include "i18n.h"
 
@@ -33,11 +35,11 @@ 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(1485) / 1080, "138", _("Academy"), "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) /  872, "235", _("2.35"), "S"));
 	_ratios.push_back (new Ratio (float(2048) /  858, "239", _("Scope"), "S"));
 	_ratios.push_back (new Ratio (float(2048) / 1080, "full-frame", _("Full frame"), "C"));
 }
@@ -45,6 +47,11 @@ Ratio::setup_ratios ()
 Ratio const *
 Ratio::from_id (string i)
 {
+	/* We removed the ratio with id 137; replace it with 138 */
+	if (i == "137") {
+		i = "138";
+	}
+
 	vector<Ratio const *>::iterator j = _ratios.begin ();
 	while (j != _ratios.end() && (*j)->id() != i) {
 		++j;
@@ -72,4 +79,20 @@ Ratio::from_ratio (float r)
 
 	return *j;
 }
-   
+
+Ratio const *
+Ratio::nearest_from_ratio (float r)
+{
+	Ratio const * nearest = 0;
+	float distance = FLT_MAX;
+
+	for (vector<Ratio const *>::iterator i = _ratios.begin (); i != _ratios.end(); ++i) {
+		float const d = fabs ((*i)->ratio() - r);
+		if (d < distance) {
+			distance = d;
+			nearest = *i;
+		}
+	}
+
+	return nearest;
+}