projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move Image::as_png() out to image_as_png().
[dcpomatic.git]
/
src
/
wx
/
player_config_dialog.cc
diff --git
a/src/wx/player_config_dialog.cc
b/src/wx/player_config_dialog.cc
index af0f8641efe9c23a91d34fcabc9604284dcf8890..be310a93170cf488a2bfd21f3a97bd880ed897b9 100644
(file)
--- a/
src/wx/player_config_dialog.cc
+++ b/
src/wx/player_config_dialog.cc
@@
-18,58
+18,63
@@
*/
*/
+
/** @file src/player_config_dialog.cc
* @brief A dialogue to edit DCP-o-matic Player configuration.
*/
/** @file src/player_config_dialog.cc
* @brief A dialogue to edit DCP-o-matic Player configuration.
*/
+
+#include "check_box.h"
#include "config_dialog.h"
#include "config_dialog.h"
-#include "
wx_uti
l.h"
+#include "
dir_picker_ctr
l.h"
#include "editable_list.h"
#include "editable_list.h"
-#include "
filter
_dialog.h"
+#include "
email
_dialog.h"
#include "file_picker_ctrl.h"
#include "file_picker_ctrl.h"
-#include "dir_picker_ctrl.h"
-#include "server_dialog.h"
+#include "filter_dialog.h"
#include "make_chain_dialog.h"
#include "make_chain_dialog.h"
-#include "email_dialog.h"
-#include "name_format_editor.h"
#include "nag_dialog.h"
#include "nag_dialog.h"
-#include "check_box.h"
+#include "name_format_editor.h"
+#include "server_dialog.h"
#include "static_text.h"
#include "static_text.h"
+#include "wx_util.h"
#include "lib/config.h"
#include "lib/config.h"
-#include "lib/ratio.h"
-#include "lib/filter.h"
+#include "lib/cross.h"
#include "lib/dcp_content_type.h"
#include "lib/dcp_content_type.h"
+#include "lib/exceptions.h"
+#include "lib/filter.h"
#include "lib/log.h"
#include "lib/log.h"
+#include "lib/ratio.h"
#include "lib/util.h"
#include "lib/util.h"
-#include "lib/cross.h"
-#include "lib/exceptions.h"
-#include <dcp/locale_convert.h>
-#include <dcp/exceptions.h>
#include <dcp/certificate_chain.h>
#include <dcp/certificate_chain.h>
-#include <wx/stdpaths.h>
+#include <dcp/exceptions.h>
+#include <dcp/locale_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/filepicker.h>
#include <wx/preferences.h>
#include <wx/spinctrl.h>
#include <wx/preferences.h>
#include <wx/spinctrl.h>
-#include <wx/filepicker.h>
+#include <wx/stdpaths.h>
+LIBDCP_ENABLE_WARNINGS
#include <RtAudio.h>
#include <boost/filesystem.hpp>
#include <RtAudio.h>
#include <boost/filesystem.hpp>
-#include <iostream>
-using std::vector;
-using std::
string
;
+
+using std::
function
;
using std::list;
using std::list;
-using std::cout;
-using std::pair;
using std::make_pair;
using std::map;
using std::make_pair;
using std::map;
-using
boost::bind
;
+using
std::pair
;
using std::shared_ptr;
using std::shared_ptr;
-using std::function;
+using std::string;
+using std::vector;
+using boost::bind;
using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
using dcp::locale_convert;
using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
using dcp::locale_convert;
+
class PlayerGeneralPage : public GeneralPage
{
public:
class PlayerGeneralPage : public GeneralPage
{
public: