X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fformat.h;h=e953062329d9b583a0cfd078159499fb991320dc;hb=8eabffda9a95de36df560c1b6eadd1a7baa852c7;hp=fd6cdbece31b1ffb51db910fa77493a98228aa38;hpb=cb33319a820b17a05cfb2ef78ba1799f4d0c54b9;p=dcpomatic.git

diff --git a/src/lib/format.h b/src/lib/format.h
index fd6cdbece..e95306232 100644
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -31,27 +31,23 @@ class Film;
 class Format
 {
 public:
-	Format (Size dcp, std::string id, std::string n)
+	Format (libdcp::Size dcp, std::string id, std::string n, std::string d)
 		: _dcp_size (dcp)
 		, _id (id)
 		, _nickname (n)
+		, _dci_name (d)
 	{}
 
-	/** @return the aspect ratio multiplied by 100
-	 *  (e.g. 239 for Cinemascope 2.39:1)
-	 */
-	virtual int ratio_as_integer (Film const * f) const = 0;
-
-	/** @return the ratio as a floating point number */
-	virtual float ratio_as_float (Film const * f) const = 0;
+	/** @return the ratio of the container (including any padding) */
+	float container_ratio () const;
 
-	int dcp_padding (Film const * f) const;
+	int dcp_padding (boost::shared_ptr<const Film> f) const;
 
 	/** @return size in pixels of the images that we should
 	 *  put in a DCP for this ratio.  This size will not correspond
 	 *  to the ratio when we are doing things like 16:9 in a Flat frame.
 	 */
-	Size dcp_size () const {
+	libdcp::Size dcp_size () const {
 		return _dcp_size;
 	}
 
@@ -67,6 +63,10 @@ public:
 		return _nickname;
 	}
 
+	std::string dci_name () const {
+		return _dci_name;
+	}
+
 	std::string as_metadata () const;
 
 	static Format const * from_nickname (std::string n);
@@ -76,15 +76,19 @@ public:
 	static void setup_formats ();
 
 protected:	
-	/** Size in pixels of the images that we should
+        /** @return the ratio */
+	virtual float ratio (boost::shared_ptr<const Film> f) const = 0;
+
+	/** libdcp::Size in pixels of the images that we should
 	 *  put in a DCP for this ratio.  This size will not correspond
 	 *  to the ratio when we are doing things like 16:9 in a Flat frame.
 	 */
-	Size _dcp_size;
+	libdcp::Size _dcp_size;
 	/** id for use in metadata */
 	std::string _id;
 	/** nickname (e.g. Flat, Scope) */
 	std::string _nickname;
+	std::string _dci_name;
 
 private:	
 	/** all available formats */
@@ -98,31 +102,25 @@ private:
 class FixedFormat : public Format
 {
 public:
-	FixedFormat (int, Size, std::string, std::string);
+	FixedFormat (float, libdcp::Size, std::string, std::string, std::string);
 
-	int ratio_as_integer (Film const *) const {
+	float ratio (boost::shared_ptr<const Film>) const {
 		return _ratio;
 	}
 
-	float ratio_as_float (Film const *) const {
-		return _ratio / 100.0;
-	}
-
 	std::string name () const;
 	
 private:
 
-	/** Ratio expressed as the actual ratio multiplied by 100 */
-	int _ratio;
+	float _ratio;
 };
 
 class VariableFormat : public Format
 {
 public:
-	VariableFormat (Size, std::string, std::string);
+	VariableFormat (libdcp::Size, std::string, std::string, std::string);
 
-	int ratio_as_integer (Film const * f) const;
-	float ratio_as_float (Film const * f) const;
+	float ratio (boost::shared_ptr<const Film> f) const;
 
 	std::string name () const;
 };