Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --git a/cscript b/cscript
index 332ffef0e28ab789b40ad9652d6bd491fa68b313..b6ff8612af48d148f566b0856dba32ba9227d3b9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -252,8 +252,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
-            ('libdcp', '4852a22'),
-            ('libsub', 'b98c145'))
+            ('libdcp', 'de32e99'),
+            ('libsub', '2d6d0e0'))
 
 def configure_options(target):
     opt = ''
@@ -269,6 +269,8 @@ def configure_options(target):
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
                 opt += ' --workaround-gssapi --static-xmlpp'
+        if target.distro == 'debian' and target.version == 'unstable':
+            target.append_with_space('CXXFLAGS', '-std=c++11')
 
     return opt
 

diff --git a/src/lib/config.cc b/src/lib/config.cc
index a51c775a38132f2fd72502c605cdf26635759703..64d794b365fae6fd65d9b87eddfd4875cc7cd0e8 100644 (file)
--- 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 5b02d71e358a4f0e016ce6be3ef8efec222381ea..dcafee4caff7ae207e499f3bdcac6b5899f4583d 100644 (file)
--- 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 9713cde1b0f555713f17a7ee5a5c52bd1cd69069..e4e16157d3b648b67350a95bbeff0d582d145a05 100644 (file)
--- 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 66e37a4cf94d58225b199fa8a88cef93fe19de22..13dd9f42fbdba4cdc5d49f86a39637a60ac796b9 100644 (file)
--- 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 (