Tidy up ScreensPanel code a bit.

[dcpomatic.git] / src / wx / content_colour_conversion_dialog.cc

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 9713cde1b0f555713f17a7ee5a5c52bd1cd69069..651e1dc6690c3bd032bbc0be69497cf1a2c653b8 100644 (file)
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -32,9 +32,9 @@ using std::vector;
 using std::cout;
 using boost::optional;
 
-ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
+ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent, bool yuv)
        : wxDialog (parent, wxID_ANY, _("Colour conversion"))
-       , _editor (new ColourConversionEditor (this))
+       , _editor (new ColourConversionEditor (this, yuv))
        , _setting (false)
 {
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
@@ -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);
        }
 }
-
-