X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcolour_conversion_editor.h;h=de5ffb794febeb1c35217c6a15680d03fdcc36da;hb=d2cf60a908766b73c13e0eed06f89892090415c3;hp=f1186aa2a8a2693fbec5de744c79e2cd7b1607ca;hpb=caee7a9456d4abb953d1311333bcdd3454883229;p=dcpomatic.git

diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index f1186aa2a..de5ffb794 100644
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -1,30 +1,39 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #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
 {
@@ -38,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 ();
@@ -48,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;
@@ -66,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
+