X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fformat.cc;h=f5026c0da8faf0ddf8267c11b0a32adcc163a9c8;hb=cd4a82d90677cec80e891ac190000cb70767446f;hp=640eee1670369911c5608eb5f308d51306bb5e79;hpb=f074b7016ec58e831d9270f98ddc3ea31874a786;p=dcpomatic.git

diff --git a/src/lib/format.cc b/src/lib/format.cc
index 640eee167..f5026c0da 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -29,6 +29,7 @@
 #include <iostream>
 #include "format.h"
 #include "film.h"
+#include "playlist.h"
 
 #include "i18n.h"
 
@@ -50,7 +51,7 @@ FixedFormat::name () const
 		s << _nickname << N_(" (");
 	}
 
-	s << setprecision(3) << (_ratio / 100.0) << N_(":1");
+	s << setprecision(3) << _ratio << N_(":1");
 
 	if (!_nickname.empty ()) {
 		s << N_(")");
@@ -59,13 +60,6 @@ FixedFormat::name () const
 	return s.str ();
 }
 
-/** @return Identifier for this format as metadata for a Film's metadata file */
-string
-Format::as_metadata () const
-{
-	return _id;
-}
-
 /** Fill our _formats vector with all available formats */
 void
 Format::setup_formats ()
@@ -164,16 +158,6 @@ Format::from_id (string i)
 	return *j;
 }
 
-
-/** @param m Metadata, as returned from as_metadata().
- *  @return Matching Format, or 0.
- */
-Format const *
-Format::from_metadata (string m)
-{
-	return from_id (m);
-}
-
 /** @return All available formats */
 vector<Format const *>
 Format::all ()
@@ -224,7 +208,7 @@ 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->size ());
+	libdcp::Size const c = f->cropped_size (f->video_size ());
 	return float (c.width) / c.height;
 }