X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fratio.h;h=7b70bd7f7b2572dc8bbaa55a56827b2f5217a187;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=cd7d0d6e4de276b138f92733b3bbcee99ad5d10a;hpb=39bc73fe192f932ed6695eb87b19de446e8b4f55;p=dcpomatic.git diff --git a/src/lib/ratio.h b/src/lib/ratio.h index cd7d0d6e4..7b70bd7f7 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,9 +64,9 @@ private: std::string _id; /** nickname (e.g. Flat, Scope) */ std::string _nickname; - std::string _dci_name; + std::string _isdcf_name; - static std::vector _ratios; + static std::vector _ratios; }; #endif