X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fformat.cc;h=e2efe9a6ba61f2c8bf840d12851e53c3ad039ff4;hb=237a0052c60af768f4d62b00321932918b7ba4d9;hp=f5026c0da8faf0ddf8267c11b0a32adcc163a9c8;hpb=92cafb6fc686a041354da2eabde6bcb2f6846e1d;p=dcpomatic.git

diff --git a/src/lib/format.cc b/src/lib/format.cc
index f5026c0da..e2efe9a6b 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -66,59 +66,63 @@ Format::setup_formats ()
 {
 	/// 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), N_("119"), _("1.19"), N_("F")
+		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), N_("133"), _("4:3"), N_("F")
+		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), N_("138"), _("1.375"), N_("F")
+		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), N_("133-in-flat"), _("4:3 within Flat"), N_("F")
+		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), N_("137"), _("Academy"), N_("F")
+		new FixedFormat (1.37, libdcp::Size (1480, 1080), "137", _("Academy"), "F"
 			));
 	
 	_formats.push_back (
-		new FixedFormat (1.66, libdcp::Size (1793, 1080), N_("166"), _("1.66"), N_("F")
+		new FixedFormat (1.66, libdcp::Size (1793, 1080), "166", _("1.66"), "F"
 			));
 	
 	_formats.push_back (
-		new FixedFormat (1.66, libdcp::Size (1998, 1080), N_("166-in-flat"), _("1.66 within Flat"), N_("F")
+		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), N_("178-in-flat"), _("16:9 within Flat"), N_("F")
+		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), N_("178"), _("16:9"), N_("F")
+		new FixedFormat (1.78, libdcp::Size (1920, 1080), "178", _("16:9"), "F"
 			));
 	
 	_formats.push_back (
-		new FixedFormat (1.85, libdcp::Size (1998, 1080), N_("185"), _("Flat"), N_("F")
+		new FixedFormat (1.85, libdcp::Size (1998, 1080), "185", _("Flat"), "F"
 			));
 	
 	_formats.push_back (
-		new FixedFormat (1.78, libdcp::Size (2048, 858), N_("178-in-scope"), _("16:9 within Scope"), N_("S")
+		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), N_("239"), _("Scope"), N_("S")
+		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), N_("var-185"), _("Flat without stretch"), N_("F")
+		new VariableFormat (libdcp::Size (1998, 1080), "var-185", _("Flat without stretch"), "F"
 			));
 	
 	_formats.push_back (
-		new VariableFormat (libdcp::Size (2048, 858), N_("var-239"), _("Scope without stretch"), N_("S")
+		new VariableFormat (libdcp::Size (2048, 858), "var-239", _("Scope without stretch"), "S"
 			));
 }
 
@@ -208,7 +212,8 @@ VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d)
 float
 VariableFormat::ratio (shared_ptr<const Film> f) const
 {
-	libdcp::Size const c = f->cropped_size (f->video_size ());
+	/* XXX */
+	libdcp::Size const c;// = f->cropped_size (f->video_size ());
 	return float (c.width) / c.height;
 }