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 | |
| parent | f98c4cdec82fc2fbdcc4ca19748d09b0ea0556b4 (diff) | |
Fix save/restore of encrypted option.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/film.cc | 3 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 4 |
2 files changed, 5 insertions, 2 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"); diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 56b697375..a85052645 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -234,6 +234,7 @@ FilmEditor::connect_to_widgets () _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::dcp_content_type_changed, this)); _frame_rate->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::frame_rate_changed, this)); _best_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::best_frame_rate_clicked, this)); + _encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::encrypted_toggled, this)); _audio_channels->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::audio_channels_changed, this)); _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::j2k_bandwidth_changed, this)); _resolution->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::resolution_changed, this)); @@ -443,7 +444,7 @@ FilmEditor::film_changed (Film::Property p) break; } case Film::AUDIO_CHANNELS: - _audio_channels->SetValue (_film->audio_channels ()); + checked_set (_audio_channels, _film->audio_channels ()); setup_dcp_name (); break; case Film::SEQUENCE_VIDEO: @@ -571,6 +572,7 @@ FilmEditor::set_film (shared_ptr<Film> f) film_changed (Film::DCI_METADATA); film_changed (Film::VIDEO_FRAME_RATE); film_changed (Film::AUDIO_CHANNELS); + film_changed (Film::ENCRYPTED); film_changed (Film::SEQUENCE_VIDEO); film_changed (Film::THREE_D); film_changed (Film::INTEROP); |