Tests of Player::dcp_to_content_video, content_video_to_dcp and

[dcpomatic.git] / src / lib / ratio.cc

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index 29c22c78deadde5d6517a4574192359384f97ce5..a6ebad14117542443e3fd704b35ca7cacdfbebd3 100644 (file)
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -1,5 +1,5 @@
 /*
-    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
@@ -34,8 +34,7 @@ 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"));
@@ -46,6 +45,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;
@@ -73,13 +77,13 @@ 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) {