diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-31 14:19:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-31 14:19:50 +0100 |
| commit | f385ef03e5ea27519a31c0839447735a7fba0602 (patch) | |
| tree | 310902e785a95c2e3be1ba389f29cd7bd480f2a2 /src/lib/config.cc | |
| parent | c13771610ef9a01cb29342bca82f9999f8b5ddbc (diff) | |
Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index c5245bfb4..978428b02 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -27,7 +27,7 @@ #include "server.h" #include "scaler.h" #include "filter.h" -#include "container.h" +#include "ratio.h" #include "dcp_content_type.h" #include "sound_processor.h" @@ -106,7 +106,7 @@ Config::read () c = f.optional_string_child ("DefaultContainer"); if (c) { - _default_container = Container::from_id (c.get ()); + _default_container = Ratio::from_id (c.get ()); } c = f.optional_string_child ("DefaultDCPContentType"); @@ -168,7 +168,7 @@ Config::read_old_metadata () } else if (k == "language") { _language = v; } else if (k == "default_container") { - _default_container = Container::from_id (v); + _default_container = Ratio::from_id (v); } else if (k == "default_dcp_content_type") { _default_dcp_content_type = DCPContentType::from_dci_name (v); } else if (k == "dcp_metadata_issuer") { |
