X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_config_dialog.cc;h=61b278a594473041bcfb3ae28222230d6e4c38c1;hb=3044ef060894c62e8a1cef15ad14078001093982;hp=b4a4ee4f4006dd08b45cf4468aaa04fba9342487;hpb=7d1c30d17b3494e07fd32dd34cd4806006e725dd;p=dcpomatic.git

diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index b4a4ee4f4..61b278a59 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -102,6 +102,20 @@ private:
 		table->Add (_image_display, wxGBPosition(r, 1));
 		++r;
 
+		add_label_to_sizer (table, _panel, _("Video display mode"), true, wxGBPosition(r, 0));
+		_video_display_mode = new wxChoice (_panel, wxID_ANY);
+		_video_display_mode->Append (_("Simple (safer)"));
+		_video_display_mode->Append (_("OpenGL (faster)"));
+		table->Add (_video_display_mode, wxGBPosition(r, 1));
+		++r;
+
+		wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to change display mode)"), false, wxGBPosition(r, 0));
+		wxFont font = restart->GetFont();
+		font.SetStyle (wxFONTSTYLE_ITALIC);
+		font.SetPointSize (font.GetPointSize() - 1);
+		restart->SetFont (font);
+		++r;
+
 		_respect_kdm = new CheckBox (_panel, _("Respect KDM validity periods"));
 		table->Add (_respect_kdm, wxGBPosition(r, 0), wxGBSpan(1, 2));
 		++r;
@@ -111,6 +125,11 @@ private:
 		table->Add (_activity_log_file, wxGBPosition(r, 1));
 		++r;
 
+		add_label_to_sizer (table, _panel, _("Debug log file"), true, wxGBPosition (r, 0));
+		_debug_log_file = new FilePickerCtrl (_panel, _("Select debug log file"), "*", true);
+		table->Add (_debug_log_file, wxGBPosition(r, 1));
+		++r;
+
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 		add_label_to_sizer (table, _panel, _("KDM server URL"), true, wxGBPosition(r, 0));
 		_kdm_server_url = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(400, -1));
@@ -125,8 +144,10 @@ private:
 
 		_player_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::player_mode_changed, this));
 		_image_display->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::image_display_changed, this));
+		_video_display_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::video_display_mode_changed, this));
 		_respect_kdm->Bind (wxEVT_CHECKBOX, bind(&PlayerGeneralPage::respect_kdm_changed, this));
 		_activity_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::activity_log_file_changed, this));
+		_debug_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::debug_log_file_changed, this));
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 		_kdm_server_url->Bind (wxEVT_TEXT, bind(&PlayerGeneralPage::kdm_server_url_changed, this));
 		_lock_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::lock_file_changed, this));
@@ -151,11 +172,23 @@ private:
 			break;
 		}
 
+		switch (config->video_view_type()) {
+		case Config::VIDEO_VIEW_SIMPLE:
+			checked_set (_video_display_mode, 0);
+			break;
+		case Config::VIDEO_VIEW_OPENGL:
+			checked_set (_video_display_mode, 1);
+			break;
+		}
+
 		checked_set (_image_display, config->image_display());
 		checked_set (_respect_kdm, config->respect_kdm_validity_periods());
 		if (config->player_activity_log_file()) {
 			checked_set (_activity_log_file, *config->player_activity_log_file());
 		}
+		if (config->player_debug_log_file()) {
+			checked_set (_debug_log_file, *config->player_debug_log_file());
+		}
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 		checked_set (_kdm_server_url, config->kdm_server_url());
 		if (config->player_lock_file()) {
@@ -185,6 +218,15 @@ private:
 		Config::instance()->set_image_display(_image_display->GetSelection());
 	}
 
+	void video_display_mode_changed ()
+	{
+		if (_video_display_mode->GetSelection() == 0) {
+			Config::instance()->set_video_view_type (Config::VIDEO_VIEW_SIMPLE);
+		} else {
+			Config::instance()->set_video_view_type (Config::VIDEO_VIEW_OPENGL);
+		}
+	}
+
 	void respect_kdm_changed ()
 	{
 		Config::instance()->set_respect_kdm_validity_periods(_respect_kdm->GetValue());
@@ -195,6 +237,11 @@ private:
 		Config::instance()->set_player_activity_log_file(wx_to_std(_activity_log_file->GetPath()));
 	}
 
+	void debug_log_file_changed ()
+	{
+		Config::instance()->set_player_debug_log_file(wx_to_std(_debug_log_file->GetPath()));
+	}
+
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	void kdm_server_url_changed ()
 	{
@@ -209,8 +256,10 @@ private:
 
 	wxChoice* _player_mode;
 	wxChoice* _image_display;
+	wxChoice* _video_display_mode;
 	wxCheckBox* _respect_kdm;
 	FilePickerCtrl* _activity_log_file;
+	FilePickerCtrl* _debug_log_file;
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	wxTextCtrl* _kdm_server_url;
 	FilePickerCtrl* _lock_file;
@@ -422,12 +471,12 @@ public:
 private:
 	void setup ()
 	{
-		vector<string> columns;
-		columns.push_back(wx_to_std(_("Manufacturer ID")));
-		columns.push_back(wx_to_std(_("Product code")));
-		columns.push_back(wx_to_std(_("Serial")));
-		columns.push_back(wx_to_std(_("Manufacture week")));
-		columns.push_back(wx_to_std(_("Manufacture year")));
+		vector<EditableListColumn> columns;
+		columns.push_back(EditableListColumn(wx_to_std(_("Manufacturer ID"))));
+		columns.push_back(EditableListColumn(wx_to_std(_("Product code"))));
+		columns.push_back(EditableListColumn(wx_to_std(_("Serial"))));
+		columns.push_back(EditableListColumn(wx_to_std(_("Manufacture week"))));
+		columns.push_back(EditableListColumn(wx_to_std(_("Manufacture year"))));
 		_monitor_list = new EditableList<Monitor, MonitorDialog> (
 			_panel,
 			columns,
@@ -435,8 +484,7 @@ private:
 			boost::bind (&Config::set_required_monitors, Config::instance(), _1),
 			boost::bind (&DevicesPage::monitor_column, this, _1, _2),
 			true,
-			true,
-			100
+			true
 			);
 		_panel->GetSizer()->Add(_monitor_list, 1, wxEXPAND | wxALL, _border);