projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optimise decoder_factory for DCPDecoder by offering the old decoder
[dcpomatic.git]
/
src
/
wx
/
content_colour_conversion_dialog.h
diff --git
a/src/wx/content_colour_conversion_dialog.h
b/src/wx/content_colour_conversion_dialog.h
index e6069f117d583c6df33734087c0c0e00fa1f0a96..471c1f8849dad60688d489e45e91d57dfd2a0aeb 100644
(file)
--- a/
src/wx/content_colour_conversion_dialog.h
+++ b/
src/wx/content_colour_conversion_dialog.h
@@
-1,22
+1,24
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2015
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.
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
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/>.
*/
*/
+#include "lib/colour_conversion.h"
#include <wx/wx.h>
class ColourConversionEditor;
#include <wx/wx.h>
class ColourConversionEditor;
@@
-24,7
+26,7
@@
class ColourConversionEditor;
class ContentColourConversionDialog : public wxDialog
{
public:
class ContentColourConversionDialog : public wxDialog
{
public:
- ContentColourConversionDialog (wxWindow *);
+ ContentColourConversionDialog (wxWindow *
, bool yuv
);
void set (ColourConversion);
ColourConversion get () const;
void set (ColourConversion);
ColourConversion get () const;
@@
-33,9
+35,11
@@
private:
void check_for_preset ();
void preset_check_clicked ();
void preset_choice_changed ();
void check_for_preset ();
void preset_check_clicked ();
void preset_choice_changed ();
-
+
wxCheckBox* _preset_check;
wxChoice* _preset_choice;
ColourConversionEditor* _editor;
bool _setting;
wxCheckBox* _preset_check;
wxChoice* _preset_choice;
ColourConversionEditor* _editor;
bool _setting;
+
+ boost::signals2::scoped_connection _editor_connection;
};
};