projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove player activity logging. Fixes #2122.
[dcpomatic.git]
/
src
/
wx
/
controls.h
diff --git
a/src/wx/controls.h
b/src/wx/controls.h
index a2c80b8090bdd9c9d30e700bea47eeef89a4e8aa..ca9c2008759c0ad9b7a8609d41982e0f74e32b37 100644
(file)
--- a/
src/wx/controls.h
+++ b/
src/wx/controls.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,9
+18,11
@@
*/
*/
+
#ifndef DCPOMATIC_CONTROLS_H
#define DCPOMATIC_CONTROLS_H
#ifndef DCPOMATIC_CONTROLS_H
#define DCPOMATIC_CONTROLS_H
+
#include "lib/dcpomatic_time.h"
#include "lib/types.h"
#include "lib/film.h"
#include "lib/dcpomatic_time.h"
#include "lib/types.h"
#include "lib/film.h"
@@
-30,6
+32,7
@@
DCPOMATIC_DISABLE_WARNINGS
DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
+
class FilmViewer;
class Film;
class ClosedCaptionsDialog;
class FilmViewer;
class Film;
class ClosedCaptionsDialog;
@@
-39,10
+42,12
@@
class wxToggleButton;
class wxListCtrl;
class ContentView;
class wxListCtrl;
class ContentView;
+
namespace dcp {
class CPL;
}
namespace dcp {
class CPL;
}
+
class Controls : public wxPanel
{
public:
class Controls : public wxPanel
{
public:
@@
-52,7
+57,6
@@
public:
bool editor_controls = true
);
bool editor_controls = true
);
- virtual void log (wxString) {}
virtual void set_film (std::shared_ptr<Film> film);
virtual void play () {};
virtual void set_film (std::shared_ptr<Film> film);
virtual void play () {};
@@
-64,6
+68,7
@@
public:
void forward_frame ();
protected:
void forward_frame ();
protected:
+
virtual void started ();
virtual void stopped ();
virtual void setup_sensitivity ();
virtual void started ();
virtual void stopped ();
virtual void setup_sensitivity ();
@@
-73,7
+78,7
@@
protected:
wxBoxSizer* _button_sizer;
std::shared_ptr<Film> _film;
wxSlider* _slider;
wxBoxSizer* _button_sizer;
std::shared_ptr<Film> _film;
wxSlider* _slider;
- std::
shared
_ptr<FilmViewer> _viewer;
+ std::
weak
_ptr<FilmViewer> _viewer;
boost::optional<std::string> _active_job;
private:
boost::optional<std::string> _active_job;
private:
@@
-117,4
+122,5
@@
private:
boost::signals2::scoped_connection _config_changed_connection;
};
boost::signals2::scoped_connection _config_changed_connection;
};
+
#endif
#endif