X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_config_dialog.cc;h=91434beaeb6a64b36539f3acf2d74c9faeb72757;hb=6e99da2707e0af449d1aeec06a43de9af19cfa36;hp=3158b279cf4c600d0827dee923e80f4f45966976;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 3158b279c..91434beae 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -28,13 +28,11 @@
 #include "filter_dialog.h"
 #include "file_picker_ctrl.h"
 #include "dir_picker_ctrl.h"
-#include "isdcf_metadata_dialog.h"
 #include "server_dialog.h"
 #include "make_chain_dialog.h"
 #include "email_dialog.h"
 #include "name_format_editor.h"
 #include "nag_dialog.h"
-#include "monitor_dialog.h"
 #include "check_box.h"
 #include "static_text.h"
 #include "lib/config.h"
@@ -54,7 +52,6 @@
 #include <wx/filepicker.h>
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::vector;
@@ -66,7 +63,7 @@ using std::make_pair;
 using std::map;
 using boost::bind;
 using std::shared_ptr;
-using boost::function;
+using std::function;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -123,13 +120,8 @@ private:
 		table->Add (_respect_kdm, wxGBPosition(r, 0), wxGBSpan(1, 2));
 		++r;
 
-		add_label_to_sizer (table, _panel, _("Activity log file"), true, wxGBPosition (r, 0));
-		_activity_log_file = new FilePickerCtrl (_panel, _("Select activity log file"), "*", true, true);
-		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, true);
+		_debug_log_file = new FilePickerCtrl (_panel, _("Select debug log file"), "*", false, true);
 		table->Add (_debug_log_file, wxGBPosition(r, 1));
 		++r;
 
@@ -137,7 +129,6 @@ private:
 		_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));
 	}
 
@@ -170,9 +161,6 @@ private:
 
 		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());
 		}
@@ -213,11 +201,6 @@ private:
 		Config::instance()->set_respect_kdm_validity_periods(_respect_kdm->GetValue());
 	}
 
-	void activity_log_file_changed ()
-	{
-		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()));
@@ -227,7 +210,6 @@ private:
 	wxChoice* _image_display;
 	wxChoice* _video_display_mode;
 	wxCheckBox* _respect_kdm;
-	FilePickerCtrl* _activity_log_file;
 	FilePickerCtrl* _debug_log_file;
 };