Fix save/restore of encrypted option.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 4f57f202a5d4c8e02365f54fcf1051c60d20e43d..aacc5a4ccaa9ba241ba403a3ff9e246b6b016af8 100644 (file)
--- 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 56b6973757e0f7be59a52f892060a4223b4123a9..a85052645edb499a1265c26035508c3787f11ff0 100644 (file)
--- 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);