X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fformat.cc;h=78e20084784299024d5b3b665d5d9b5b436a3deb;hb=605355f3335d189f6243be42bf254df2ba0442f2;hp=eb42593feada4da576d645842bbd44cb13d60b42;hpb=110d7d4e111c2db31489296587d855328c5d8b34;p=dcpomatic.git

diff --git a/src/lib/format.cc b/src/lib/format.cc
index eb42593fe..78e200847 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -30,11 +30,14 @@
 #include "format.h"
 #include "film.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::setprecision;
 using std::stringstream;
 using std::vector;
 using boost::shared_ptr;
+using libdcp::Size;
 
 vector<Format const *> Format::_formats;
 
@@ -44,13 +47,13 @@ FixedFormat::name () const
 {
 	stringstream s;
 	if (!_nickname.empty ()) {
-		s << _nickname << " (";
+		s << _nickname << N_(" (");
 	}
 
-	s << setprecision(3) << (_ratio / 100.0) << ":1";
+	s << setprecision(3) << _ratio << N_(":1");
 
 	if (!_nickname.empty ()) {
-		s << ")";
+		s << N_(")");
 	}
 
 	return s.str ();
@@ -67,18 +70,66 @@ Format::as_metadata () const
 void
 Format::setup_formats ()
 {
-	_formats.push_back (new FixedFormat (119, Size (1285, 1080), "119", "1.19", "F"));
-	_formats.push_back (new FixedFormat (133, Size (1436, 1080), "133", "1.33", "F"));
-	_formats.push_back (new FixedFormat (138, Size (1485, 1080), "138", "1.375", "F"));
-	_formats.push_back (new FixedFormat (133, Size (1998, 1080), "133-in-flat", "4:3 within Flat", "F"));
-	_formats.push_back (new FixedFormat (137, Size (1480, 1080), "137", "Academy", "F"));
-	_formats.push_back (new FixedFormat (166, Size (1793, 1080), "166", "1.66", "F"));
-	_formats.push_back (new FixedFormat (166, Size (1998, 1080), "166-in-flat", "1.66 within Flat", "F"));
-	_formats.push_back (new FixedFormat (178, Size (1998, 1080), "178-in-flat", "16:9 within Flat", "F"));
-	_formats.push_back (new FixedFormat (185, Size (1998, 1080), "185", "Flat", "F"));
-	_formats.push_back (new FixedFormat (239, Size (2048, 858), "239", "Scope", "S"));
-	_formats.push_back (new VariableFormat (Size (1998, 1080), "var-185", "Flat", "F"));
-	_formats.push_back (new VariableFormat (Size (2048, 858), "var-239", "Scope", "S"));
+	/// TRANSLATORS: these are film picture aspect ratios; "Academy" means 1.37, "Flat" 1.85 and "Scope" 2.39.
+	_formats.push_back (
+		new FixedFormat (1.19, libdcp::Size (1285, 1080), "119", _("1.19"), "F"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (4.0 / 3.0, libdcp::Size (1436, 1080), "133", _("4:3"), "F"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (1.38, libdcp::Size (1485, 1080), "138", _("1.375"), "F"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (4.0 / 3.0, libdcp::Size (1998, 1080), "133-in-flat", _("4:3 within Flat"), "F"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (1.37, libdcp::Size (1480, 1080), "137", _("Academy"), "F"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (1.66, libdcp::Size (1793, 1080), "166", _("1.66"), "F"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (1.66, libdcp::Size (1998, 1080), "166-in-flat", _("1.66 within Flat"), "F"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (1.78, libdcp::Size (1998, 1080), "178-in-flat", _("16:9 within Flat"), "F"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (1.78, libdcp::Size (1920, 1080), "178", _("16:9"), "F"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (1.85, libdcp::Size (1998, 1080), "185", _("Flat"), "F"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (1.78, libdcp::Size (2048, 858), "178-in-scope", _("16:9 within Scope"), "S"
+			));
+	
+	_formats.push_back (
+		new FixedFormat (2.39, libdcp::Size (2048, 858), "239", _("Scope"), "S"
+			));
+
+	_formats.push_back (
+		new FixedFormat (1.896, libdcp::Size (2048, 1080), "full-frame", _("Full frame"), "C"
+			));
+		
+	_formats.push_back (
+		new VariableFormat (libdcp::Size (1998, 1080), "var-185", _("Flat without stretch"), "F"
+			));
+	
+	_formats.push_back (
+		new VariableFormat (libdcp::Size (2048, 858), "var-239", _("Scope without stretch"), "S"
+			));
 }
 
 /** @param n Nickname.
@@ -134,22 +185,25 @@ Format::all ()
 	return _formats;
 }
 
-/** @param r Ratio multiplied by 100 (e.g. 185)
+/** @param r Ratio
  *  @param dcp Size (in pixels) of the images that we should put in a DCP.
  *  @param id ID (e.g. 185)
  *  @param n Nick name (e.g. Flat)
  */
-FixedFormat::FixedFormat (int r, Size dcp, string id, string n, string d)
+FixedFormat::FixedFormat (float r, libdcp::Size dcp, string id, string n, string d)
 	: Format (dcp, id, n, d)
 	, _ratio (r)
 {
 
 }
 
+/** @return Number of pixels (int the DCP image) to pad either side of the film
+ *  (so there are dcp_padding() pixels on the left and dcp_padding() on the right)
+ */
 int
 Format::dcp_padding (shared_ptr<const Film> f) const
 {
-	int p = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_integer(f) / 100.0)) / 2.0);
+	int p = rint ((_dcp_size.width - (_dcp_size.height * ratio(f))) / 2.0);
 
 	/* This comes out -ve for Scope; bodge it */
 	if (p < 0) {
@@ -159,22 +213,23 @@ Format::dcp_padding (shared_ptr<const Film> f) const
 	return p;
 }
 
-VariableFormat::VariableFormat (Size dcp, string id, string n, string d)
-	: Format (dcp, id, n, d)
+float
+Format::container_ratio () const
 {
-
+	return static_cast<float> (_dcp_size.width) / _dcp_size.height;
 }
 
-int
-VariableFormat::ratio_as_integer (shared_ptr<const Film> f) const
+VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d)
+	: Format (dcp, id, n, d)
 {
-	return rint (ratio_as_float (f) * 100);
+
 }
 
 float
-VariableFormat::ratio_as_float (shared_ptr<const Film> f) const
+VariableFormat::ratio (shared_ptr<const Film> f) const
 {
-	return float (f->size().width) / f->size().height;
+	libdcp::Size const c = f->cropped_size (f->size ());
+	return float (c.width) / c.height;
 }
 
 /** @return A name to be presented to the user */