X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fratio.h;h=7b70bd7f7b2572dc8bbaa55a56827b2f5217a187;hb=6fde557864505b470c438e4161ee494f29b90d63;hp=c331edabe8104afd54e0ab0a8895aa7cebf5ef91;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git

diff --git a/src/lib/ratio.h b/src/lib/ratio.h
index c331edabe..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 <vector>
+#include <dcp/util.h>
 #include <boost/utility.hpp>
-#include <libdcp/util.h>
+#include <vector>
 
 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,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<Ratio const *> all () {
 		return _ratios;
 	}
@@ -64,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<Ratio const *> _ratios;	
+	static std::vector<Ratio const *> _ratios;
 };
 
 #endif