X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcolour_conversion_editor.h;h=de5ffb794febeb1c35217c6a15680d03fdcc36da;hb=c3b364d5574e02ee55bce950e2056e3df2faccff;hp=34fcf2cb24fb3a1d2eeae7ea97b6c7764c223507;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index 34fcf2cb2..de5ffb794 100644
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,14 +18,22 @@
 
 */
 
+
 #ifndef DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
 #define DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
 
-#include <boost/signals2.hpp>
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
+
 
-class wxSpinCtrlDouble;
 class ColourConversion;
+class wxGridBagSizer;
+class wxSpinCtrlDouble;
+
 
 class ColourConversionEditor : public wxPanel
 {
@@ -39,7 +47,7 @@ public:
 
 private:
 	void changed ();
-	void changed (wxSpinCtrlDouble *);
+	void spin_ctrl_changed(wxSpinCtrlDouble *);
 	void chromaticity_changed ();
 	void adjusted_white_changed ();
 	void update_rgb_to_xyz ();
@@ -49,15 +57,19 @@ private:
 	void set_text_ctrl (wxTextCtrl *, double);
 	void set_spin_ctrl (wxSpinCtrlDouble *, double);
 
+	static int const INPUT_GAMMA;
+	static int const INPUT_GAMMA_LINEARISED;
+	static int const INPUT_SGAMUT3;
+
 	std::map<wxSpinCtrlDouble*, double> _last_spin_ctrl_value;
 	bool _ignore_chromaticity_changed;
 
+	wxChoice* _input;
 	wxSpinCtrlDouble* _input_gamma;
 	wxSpinCtrlDouble* _input_power;
 	wxTextCtrl* _input_threshold;
 	wxTextCtrl* _input_A;
 	wxTextCtrl* _input_B;
-	wxCheckBox* _input_gamma_linearised;
 	wxChoice* _yuv_to_rgb;
 	wxTextCtrl* _red_x;
 	wxTextCtrl* _red_y;
@@ -67,11 +79,14 @@ private:
 	wxTextCtrl* _blue_y;
 	wxTextCtrl* _white_x;
 	wxTextCtrl* _white_y;
-	wxCheckBox* _adjust_white;
+	CheckBox* _adjust_white;
 	wxTextCtrl* _adjusted_white_x;
 	wxTextCtrl* _adjusted_white_y;
+	CheckBox* _output;
 	wxStaticText* _rgb_to_xyz[3][3];
 	wxStaticText* _bradford[3][3];
 };
 
+
 #endif
+