diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-02 10:08:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-02 10:08:20 +0100 |
| commit | a0e0bbf9d7b34d046b5f8c67ca7ddf3d3887588a (patch) | |
| tree | a8a47b65d17a01d6abdadbef0c0b567a1267eedb /src | |
| parent | aac97a7653003ab7032d927eeb236cff4ad726d1 (diff) | |
| parent | cb693715a22afa1cc56c1839b228314b597df6f3 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/config.cc | 2 | ||||
| -rw-r--r-- | src/wx/config_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/content_colour_conversion_dialog.cc | 6 | ||||
| -rw-r--r-- | src/wx/screen_dialog.cc | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index a51c775a3..64d794b36 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -232,7 +232,7 @@ Config::read () _check_for_test_updates = f.optional_bool_child("CheckForTestUpdates").get_value_or (false); _maximum_j2k_bandwidth = f.optional_number_child<int> ("MaximumJ2KBandwidth").get_value_or (250000000); - _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate"); + _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate").get_value_or (false); _log_types = f.optional_number_child<int> ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR); _automatic_audio_analysis = f.optional_bool_child ("AutomaticAudioAnalysis").get_value_or (false); diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 5b02d71e3..dcafee4ca 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -227,7 +227,7 @@ private: { Config* config = Config::instance (); - checked_set (_set_language, config->language ()); + checked_set (_set_language, static_cast<bool>(config->language())); if (config->language().get_value_or ("") == "fr") { checked_set (_language, 3); diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc index 9713cde1b..e4e16157d 100644 --- a/src/wx/content_colour_conversion_dialog.cc +++ b/src/wx/content_colour_conversion_dialog.cc @@ -93,8 +93,8 @@ ContentColourConversionDialog::check_for_preset () optional<size_t> preset = _editor->get().preset (); - _preset_check->SetValue (preset); - _preset_choice->Enable (preset); + _preset_check->SetValue (static_cast<bool>(preset)); + _preset_choice->Enable (static_cast<bool>(preset)); if (preset) { _preset_choice->SetSelection (preset.get ()); } else { @@ -123,5 +123,3 @@ ContentColourConversionDialog::preset_choice_changed () set (presets[s].conversion); } } - - diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index 66e37a4cf..13dd9f42f 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -130,7 +130,7 @@ ScreenDialog::setup_sensitivity () { wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this)); if (ok) { - ok->Enable (_certificate); + ok->Enable (static_cast<bool>(_certificate)); } _download_certificate->Enable ( |