projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add LEQ(m) when analysing audio (#1382).
[dcpomatic.git]
/
src
/
lib
/
ratio.cc
diff --git
a/src/lib/ratio.cc
b/src/lib/ratio.cc
index eae12b061ca0dd04e9692d3cd85eb5e28dd00dd5..8a86ced59088ab3cbb50ba5fbeefe3768da353e2 100644
(file)
--- a/
src/lib/ratio.cc
+++ b/
src/lib/ratio.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-20,6
+20,7
@@
#include "ratio.h"
#include "util.h"
#include "ratio.h"
#include "util.h"
+#include "config.h"
#include <dcp/types.h>
#include <cfloat>
#include <dcp/types.h>
#include <cfloat>
@@
-102,6
+103,10
@@
Ratio::nearest_from_ratio (float r)
vector<Ratio const *>
Ratio::containers ()
{
vector<Ratio const *>
Ratio::containers ()
{
+ if (Config::instance()->allow_any_container()) {
+ return _ratios;
+ }
+
vector<Ratio const *> r;
r.push_back (Ratio::from_id ("185"));
r.push_back (Ratio::from_id ("239"));
vector<Ratio const *> r;
r.push_back (Ratio::from_id ("185"));
r.push_back (Ratio::from_id ("239"));
@@
-112,6
+117,12
@@
Ratio::containers ()
string
Ratio::container_nickname () const
{
string
Ratio::container_nickname () const
{
- DCPOMATIC_ASSERT (_container_nickname);
+ if (!_container_nickname) {
+ /* Fall back to the image nickname; this just for when non-standard container
+ ratios are enabled.
+ */
+ return _image_nickname;
+ }
+
return *_container_nickname;
}
return *_container_nickname;
}