Merge master.

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

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index 5988b34188375eade8e2c8eac218de93b90bf141..fc36415c50638e161e73c8bd1df1ed19d3e01e99 100644 (file)
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -17,39 +17,26 @@
 
 */
 
-#include <libdcp/types.h>
+#include <dcp/types.h>
 #include "ratio.h"
+#include "util.h"
 
 #include "i18n.h"
 
 using std::string;
-using std::stringstream;
 using std::vector;
 
 vector<Ratio const *> Ratio::_ratios;
 
-libdcp::Size
-Ratio::size (libdcp::Size full_frame) const
-{
-       if (_ratio < static_cast<float>(full_frame.width) / full_frame.height) {
-               return libdcp::Size (full_frame.height * _ratio, full_frame.height);
-       } else {
-               return libdcp::Size (full_frame.width, full_frame.width / _ratio);
-       }
-
-       return libdcp::Size ();
-}
-
-
 void
 Ratio::setup_ratios ()
 {
-       _ratios.push_back (new Ratio (float(1285) / 1080, "119", _("1.19"), "F"));
-       _ratios.push_back (new Ratio (float(1436) / 1080, "133", _("4:3"), "F"));
-       _ratios.push_back (new Ratio (float(1480) / 1080, "137", _("Academy"), "F"));
-       _ratios.push_back (new Ratio (float(1485) / 1080, "138", _("1.375"), "F"));
-       _ratios.push_back (new Ratio (float(1793) / 1080, "166", _("1.66"), "F"));
-       _ratios.push_back (new Ratio (float(1920) / 1080, "178", _("16:9"), "F"));
+       _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"));
@@ -69,3 +56,20 @@ 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) {
+               ++j;
+       }
+
+       if (j == _ratios.end ()) {
+               return 0;
+       }
+
+       return *j;
+}
+