X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fratio.h;h=360fb2340639866c94276b09d2a5fd4f39f33b02;hb=4c803f050244e145f6e8948efbee0b4249e7f93b;hp=cd7d0d6e4de276b138f92733b3bbcee99ad5d10a;hpb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50;p=dcpomatic.git diff --git a/src/lib/ratio.h b/src/lib/ratio.h index cd7d0d6e4..360fb2340 100644 --- a/src/lib/ratio.h +++ b/src/lib/ratio.h @@ -20,9 +20,9 @@ #ifndef DCPOMATIC_RATIO_H #define DCPOMATIC_RATIO_H -#include -#include #include +#include +#include class Ratio : public boost::noncopyable { @@ -31,7 +31,7 @@ public: : _ratio (ratio) , _id (id) , _nickname (n) - , _dci_name (d) + , _isdcf_name (d) {} std::string id () const { @@ -42,8 +42,8 @@ public: return _nickname; } - std::string dci_name () const { - return _dci_name; + std::string isdcf_name () const { + return _isdcf_name; } float ratio () const { @@ -52,6 +52,8 @@ public: static void setup_ratios (); static Ratio const * from_id (std::string i); + static Ratio const * from_ratio (float r); + static Ratio const * nearest_from_ratio (float r); static std::vector all () { return _ratios; } @@ -62,7 +64,7 @@ private: std::string _id; /** nickname (e.g. Flat, Scope) */ std::string _nickname; - std::string _dci_name; + std::string _isdcf_name; static std::vector _ratios; };