X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fratio.h;h=69e3726c83f201e91cf48e5b955e215c6eea8d2c;hb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;hp=c331edabe8104afd54e0ab0a8895aa7cebf5ef91;hpb=bfc0b96db6cc6c2e94d93f9c4239adca14a6bb0c;p=dcpomatic.git diff --git a/src/lib/ratio.h b/src/lib/ratio.h index c331edabe..69e3726c8 100644 --- a/src/lib/ratio.h +++ b/src/lib/ratio.h @@ -22,7 +22,7 @@ #include #include -#include +#include class Ratio : public boost::noncopyable { @@ -31,11 +31,9 @@ public: : _ratio (ratio) , _id (id) , _nickname (n) - , _dci_name (d) + , _isdcf_name (d) {} - libdcp::Size size (libdcp::Size) const; - std::string id () const { return _id; } @@ -44,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 { @@ -54,6 +52,7 @@ public: static void setup_ratios (); static Ratio const * from_id (std::string i); + static Ratio const * from_ratio (float r); static std::vector all () { return _ratios; } @@ -64,7 +63,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; };