diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-09-19 15:12:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-09-19 15:12:27 +0100 |
| commit | 8446a529b08d754c7ffe968baef54e5c115c26a5 (patch) | |
| tree | 55b95c762a32f55ad893508dd7367e59a19385d1 /src/lib | |
| parent | f98c4cdec82fc2fbdcc4ca19748d09b0ea0556b4 (diff) | |
Fix save/restore of encrypted option.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 4f57f202a..aacc5a4cc 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -96,10 +96,10 @@ Film::Film (boost::filesystem::path dir) , _resolution (RESOLUTION_2K) , _scaler (Scaler::from_id ("bicubic")) , _with_subtitles (false) - , _encrypted (false) , _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ()) , _dci_metadata (Config::instance()->default_dci_metadata ()) , _video_frame_rate (24) + , _encrypted (false) , _audio_channels (MAX_AUDIO_CHANNELS) , _three_d (false) , _sequence_video (true) @@ -390,6 +390,7 @@ Film::read_metadata () _dci_metadata = DCIMetadata (f.node_child ("DCIMetadata")); _video_frame_rate = f.number_child<int> ("VideoFrameRate"); _dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate")); + _encrypted = f.bool_child ("Encrypted"); _audio_channels = f.number_child<int> ("AudioChannels"); _sequence_video = f.bool_child ("SequenceVideo"); _three_d = f.bool_child ("ThreeD"); |