Fix duplicate name of _mutex in ExceptionStore and some of its children.

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

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index e9b57e2e13da1ba9f60fde4b458e37f0feeb28f3..a6ebad14117542443e3fd704b35ca7cacdfbebd3 100644 (file)
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -45,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;
@@ -72,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) {