summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-11-11 22:49:34 +0100
committerCarl Hetherington <cth@carlh.net>2021-11-11 22:51:31 +0100
commitcfbe9d2f44e380efed7a61b5b5c7a2fec7794915 (patch)
tree7d1933b5205c2f27616ff2ad3f4e0d0b477a2cd2 /src/wx
parent6f2844fee27f6ebb15ea772ea2cbfc7bdf988102 (diff)
Remove player activity logging. Fixes #2122.
If I remember right this was for swaroop and I suspect nobody else is really interested.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/controls.cc26
-rw-r--r--src/wx/controls.h1
-rw-r--r--src/wx/film_viewer.cc4
-rw-r--r--src/wx/film_viewer.h4
-rw-r--r--src/wx/player_config_dialog.cc15
-rw-r--r--src/wx/playlist_controls.cc24
-rw-r--r--src/wx/playlist_controls.h1
7 files changed, 14 insertions, 61 deletions
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 29f4aeaa3..a90ac79b4 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -19,22 +19,22 @@
*/
+#include "check_box.h"
+#include "content_view.h"
#include "controls.h"
+#include "dcpomatic_button.h"
#include "film_viewer.h"
-#include "wx_util.h"
-#include "playhead_to_timecode_dialog.h"
#include "playhead_to_frame_dialog.h"
-#include "content_view.h"
+#include "playhead_to_timecode_dialog.h"
#include "static_text.h"
-#include "check_box.h"
-#include "dcpomatic_button.h"
-#include "lib/job_manager.h"
-#include "lib/player_video.h"
-#include "lib/dcp_content.h"
-#include "lib/job.h"
-#include "lib/examine_content_job.h"
+#include "wx_util.h"
#include "lib/content_factory.h"
#include "lib/cross.h"
+#include "lib/dcp_content.h"
+#include "lib/examine_content_job.h"
+#include "lib/job.h"
+#include "lib/job_manager.h"
+#include "lib/player_video.h"
#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/reel.h>
@@ -249,12 +249,6 @@ Controls::slider_moved (bool page)
}
viewer->seek (t, accurate);
update_position_label ();
-
- log (
- wxString::Format(
- "playback-seeked %s", t.timecode(_film->video_frame_rate()).c_str()
- )
- );
}
diff --git a/src/wx/controls.h b/src/wx/controls.h
index 377960425..ca9c20087 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -57,7 +57,6 @@ public:
bool editor_controls = true
);
- virtual void log (wxString) {}
virtual void set_film (std::shared_ptr<Film> film);
virtual void play () {};
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index e678c6aa3..2c90b8609 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -371,7 +371,7 @@ FilmViewer::start ()
/* Calling start() below may directly result in Stopped being emitted, and if that
* happens we want it to come after the Started signal, so do that first.
*/
- Started (position());
+ Started ();
_video_view->start ();
}
@@ -390,7 +390,7 @@ FilmViewer::stop ()
_playing = false;
_video_view->stop ();
- Stopped (position());
+ Stopped ();
_video_view->rethrow ();
return true;
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 5e5bb7916..0291b660f 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -139,8 +139,8 @@ public:
}
boost::signals2::signal<void (std::shared_ptr<PlayerVideo>)> ImageChanged;
- boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
- boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
+ boost::signals2::signal<void ()> Started;
+ boost::signals2::signal<void ()> Stopped;
/** While playing back we reached the end of the film (emitted from GUI thread) */
boost::signals2::signal<void ()> Finished;
/** Emitted from the GUI thread when a lot of frames are being dropped */
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 802ab6b3b..91434beae 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -120,11 +120,6 @@ 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"), "*", false, 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"), "*", false, true);
table->Add (_debug_log_file, wxGBPosition(r, 1));
@@ -134,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));
}
@@ -167,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());
}
@@ -210,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()));
@@ -224,7 +210,6 @@ private:
wxChoice* _image_display;
wxChoice* _video_display_mode;
wxCheckBox* _respect_kdm;
- FilePickerCtrl* _activity_log_file;
FilePickerCtrl* _debug_log_file;
};
diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index 129e0ceca..3be47ad97 100644
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -232,28 +232,6 @@ PlaylistControls::next_clicked ()
update_current_content ();
}
-void
-PlaylistControls::log (wxString s)
-{
- optional<boost::filesystem::path> log = Config::instance()->player_activity_log_file();
- if (!log) {
- return;
- }
-
- struct timeval time;
- gettimeofday (&time, 0);
- char buffer[64];
- time_t const sec = time.tv_sec;
- struct tm* t = localtime (&sec);
- strftime (buffer, 64, "%c", t);
- wxString ts = std_to_wx(string(buffer)) + N_(": ");
- FILE* f = fopen_boost (*log, "a");
- if (!f) {
- return;
- }
- fprintf (f, "%s%s\n", wx_to_std(ts).c_str(), wx_to_std(s).c_str());
- fclose (f);
-}
void
PlaylistControls::add_playlist_to_list (SPL spl)
@@ -361,8 +339,6 @@ PlaylistControls::spl_selection_changed ()
void
PlaylistControls::select_playlist (int selected, int position)
{
- log (wxString::Format("load-playlist %s", std_to_wx(_playlists[selected].name()).data()));
-
wxProgressDialog dialog (_("DCP-o-matic"), "Loading playlist and KDMs");
for (auto const& i: _playlists[selected].get()) {
diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h
index b0d04f4cb..8375f952e 100644
--- a/src/wx/playlist_controls.h
+++ b/src/wx/playlist_controls.h
@@ -28,7 +28,6 @@ class PlaylistControls : public Controls
public:
PlaylistControls (wxWindow* parent, std::shared_ptr<FilmViewer> viewer);
- void log (wxString s);
void set_film (std::shared_ptr<Film> film);
/** This is so that we can tell our parent player to reset the film