/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "ratio.h"
#include "util.h"
+#include "config.h"
#include <dcp/types.h>
#include <cfloat>
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"));
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;
}