/*
- 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
it under the terms of the GNU General Public License as published by
*/
-#include <dcp/types.h>
#include "ratio.h"
#include "util.h"
+#include <dcp/types.h>
+#include <cfloat>
#include "i18n.h"
{
_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"));
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;
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;
+}