projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.
[dcpomatic.git]
/
src
/
wx
/
controls.h
diff --git
a/src/wx/controls.h
b/src/wx/controls.h
index 1b6a379cce5a8fc6db9e8b1fadb0b3c373660a76..b9c4604b6b298b7cd80d785ff759bbad58079e1e 100644
(file)
--- a/
src/wx/controls.h
+++ b/
src/wx/controls.h
@@
-24,7
+24,6
@@
#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"
-#include "lib/spl.h"
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
@@
-53,11
+52,11
@@
public:
virtual void log (wxString) {}
virtual void set_film (boost::shared_ptr<Film> film);
virtual void log (wxString) {}
virtual void set_film (boost::shared_ptr<Film> film);
-#ifdef DCPOMATIC_PLAYER_STRESS_TEST
+
virtual void play () {};
virtual void stop () {};
void seek (int slider);
virtual void play () {};
virtual void stop () {};
void seek (int slider);
-#endif
+
boost::shared_ptr<Film> film () const;
void back_frame ();
void forward_frame ();
boost::shared_ptr<Film> film () const;
void back_frame ();
void forward_frame ();