X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_config_dialog.cc;h=58874e50b59ac63cb589ebd32bce6a28135823a7;hb=f36991d7a91a4fd38c4159d51396b0f44422fd19;hp=a7bb35bda427beca8e2e4b2f68f57d1ab46c119d;hpb=529d00f4ced6b9f5b7e351332036de414535384e;p=dcpomatic.git

diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index a7bb35bda..58874e50b 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -96,7 +96,7 @@ private:
 		_player_mode = new wxChoice (_panel, wxID_ANY);
 		_player_mode->Append (_("window"));
 		_player_mode->Append (_("full screen"));
-		_player_mode->Append (_("full screen with controls on other monitor"));
+		_player_mode->Append (_("full screen with separate advanced controls"));
 		table->Add (_player_mode, wxGBPosition(r, 1));
 		++r;
 
@@ -126,7 +126,7 @@ private:
 		++r;
 
 		add_label_to_sizer (table, _panel, _("Debug log file"), true, wxGBPosition (r, 0));
-		_debug_log_file = new FilePickerCtrl (_panel, _("Select debug log file"), "*", false, true);
+		_debug_log_file = new FilePickerCtrl(_panel, _("Select debug log file"), "*", false, true, "DebugLogPath");
 		table->Add (_debug_log_file, wxGBPosition(r, 1));
 		++r;
 
@@ -208,7 +208,9 @@ private:
 
 	void debug_log_file_changed ()
 	{
-		Config::instance()->set_player_debug_log_file(wx_to_std(_debug_log_file->GetPath()));
+		if (auto path = _debug_log_file->path()) {
+			Config::instance()->set_player_debug_log_file(*path);
+		}
 	}
 
 	wxChoice* _player_mode;
@@ -275,6 +277,8 @@ private:
 			/// TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
 			_log_timing = new CheckBox (_panel, S_("Config|Timing"));
 			t->Add (_log_timing, 1, wxEXPAND | wxALL);
+			_log_debug_video_view = new CheckBox(_panel, _("Debug: video view"));
+			t->Add(_log_debug_video_view, 1, wxEXPAND | wxALL);
 			table->Add (t, 0, wxALL, 6);
 		}
 
@@ -288,6 +292,7 @@ private:
 		_log_warning->bind(&PlayerAdvancedPage::log_changed, this);
 		_log_error->bind(&PlayerAdvancedPage::log_changed, this);
 		_log_timing->bind(&PlayerAdvancedPage::log_changed, this);
+		_log_debug_video_view->bind(&PlayerAdvancedPage::log_changed, this);
 #ifdef DCPOMATIC_WINDOWS
 		_win32_console->bind(&PlayerAdvancedPage::win32_console_changed, this);
 #endif
@@ -321,6 +326,9 @@ private:
 		if (_log_timing->GetValue ()) {
 			types |= LogEntry::TYPE_TIMING;
 		}
+		if (_log_debug_video_view->GetValue()) {
+			types |= LogEntry::TYPE_DEBUG_VIDEO_VIEW;
+		}
 		Config::instance()->set_log_types (types);
 	}
 
@@ -335,6 +343,7 @@ private:
 	CheckBox* _log_warning;
 	CheckBox* _log_error;
 	CheckBox* _log_timing;
+	CheckBox* _log_debug_video_view;
 #ifdef DCPOMATIC_WINDOWS
 	CheckBox* _win32_console;
 #endif