projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable YUV->RGB conversion controls with non-YUV sources (#649).
[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 20cbaa02d341c0053012a57bdbbc18df111edc92..651e1dc6690c3bd032bbc0be69497cf1a2c653b8 100644
(file)
--- a/
src/wx/content_colour_conversion_dialog.cc
+++ b/
src/wx/content_colour_conversion_dialog.cc
@@
-25,15
+25,16
@@
#include "colour_conversion_editor.h"
#include <wx/statline.h>
#include <boost/foreach.hpp>
#include "colour_conversion_editor.h"
#include <wx/statline.h>
#include <boost/foreach.hpp>
+#include <iostream>
using std::string;
using std::vector;
using std::cout;
using boost::optional;
using std::string;
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"))
: wxDialog (parent, wxID_ANY, _("Colour conversion"))
- , _editor (new ColourConversionEditor (this))
+ , _editor (new ColourConversionEditor (this
, yuv
))
, _setting (false)
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
, _setting (false)
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
@@
-89,11
+90,11
@@
ContentColourConversionDialog::check_for_preset ()
if (_setting) {
return;
}
if (_setting) {
return;
}
-
+
optional<size_t> preset = _editor->get().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 {
if (preset) {
_preset_choice->SetSelection (preset.get ());
} else {
@@
-122,5
+123,3
@@
ContentColourConversionDialog::preset_choice_changed ()
set (presets[s].conversion);
}
}
set (presets[s].conversion);
}
}
-
-