projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master into direct-mxf.
[dcpomatic.git]
/
src
/
lib
/
config.cc
diff --git
a/src/lib/config.cc
b/src/lib/config.cc
index 65d01bf00b64654e0e96762d6fb0f43f43e2aec6..c165859b01bd25b3d7e1d768c86f8bca71af8c85 100644
(file)
--- a/
src/lib/config.cc
+++ b/
src/lib/config.cc
@@
-44,6
+44,10
@@
Config::Config ()
, _tms_path (".")
, _sound_processor (SoundProcessor::from_id ("dolby_cp750"))
{
, _tms_path (".")
, _sound_processor (SoundProcessor::from_id ("dolby_cp750"))
{
+ _allowed_dcp_frame_rates.push_back (24);
+ _allowed_dcp_frame_rates.push_back (25);
+ _allowed_dcp_frame_rates.push_back (30);
+
ifstream f (file().c_str ());
string line;
while (getline (f, line)) {
ifstream f (file().c_str ());
string line;
while (getline (f, line)) {
@@
-86,6
+90,8
@@
Config::Config ()
} else if (k == "sound_processor") {
_sound_processor = SoundProcessor::from_id (v);
}
} else if (k == "sound_processor") {
_sound_processor = SoundProcessor::from_id (v);
}
+
+ _default_dci_metadata.read (k, v);
}
}
}
}
@@
-132,7
+138,9
@@
Config::write () const
f << "tms_path " << _tms_path << "\n";
f << "tms_user " << _tms_user << "\n";
f << "tms_password " << _tms_password << "\n";
f << "tms_path " << _tms_path << "\n";
f << "tms_user " << _tms_user << "\n";
f << "tms_password " << _tms_password << "\n";
- f << "sound_processor " << _sound_processor->id ();
+ f << "sound_processor " << _sound_processor->id () << "\n";
+
+ _default_dci_metadata.write (f);
}
string
}
string