X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fratio.h;h=22fc7662c9c9cf28d2a625d45256f8cfcaf789a7;hb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;hp=6916a74912cdaa5c9c322312e867747b40d9f700;hpb=f385ef03e5ea27519a31c0839447735a7fba0602;p=dcpomatic.git diff --git a/src/lib/ratio.h b/src/lib/ratio.h index 6916a7491..22fc7662c 100644 --- a/src/lib/ratio.h +++ b/src/lib/ratio.h @@ -17,21 +17,23 @@ */ +#ifndef DCPOMATIC_RATIO_H +#define DCPOMATIC_RATIO_H + #include -#include +#include +#include -class Ratio +class Ratio : public boost::noncopyable { public: Ratio (float ratio, std::string id, std::string n, std::string d) : _ratio (ratio) , _id (id) , _nickname (n) - , _dci_name (d) + , _isdcf_name (d) {} - libdcp::Size size (libdcp::Size) const; - std::string id () const { return _id; } @@ -40,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 { @@ -60,7 +62,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; }; + +#endif