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 9a22d770908ae6d6e581fbce6427b59c4389ba72..ca9c2008759c0ad9b7a8609d41982e0f74e32b37 100644
(file)
--- a/
src/wx/controls.h
+++ b/
src/wx/controls.h
@@
-57,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 () {};
@@
-79,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: