projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested merge of master.
[dcpomatic.git]
/
src
/
lib
/
format.cc
diff --git
a/src/lib/format.cc
b/src/lib/format.cc
index 640eee1670369911c5608eb5f308d51306bb5e79..a83d53ebd1aa3ba01a486c488cb35d90b3645e67 100644
(file)
--- a/
src/lib/format.cc
+++ b/
src/lib/format.cc
@@
-29,6
+29,7
@@
#include <iostream>
#include "format.h"
#include "film.h"
#include <iostream>
#include "format.h"
#include "film.h"
+#include "playlist.h"
#include "i18n.h"
#include "i18n.h"
@@
-50,7
+51,7
@@
FixedFormat::name () const
s << _nickname << N_(" (");
}
s << _nickname << N_(" (");
}
- s << setprecision(3) <<
(_ratio / 100.0)
<< N_(":1");
+ s << setprecision(3) <<
_ratio
<< N_(":1");
if (!_nickname.empty ()) {
s << N_(")");
if (!_nickname.empty ()) {
s << N_(")");
@@
-224,7
+225,7
@@
VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d)
float
VariableFormat::ratio (shared_ptr<const Film> f) const
{
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;
}
return float (c.width) / c.height;
}