projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Barely-functioning GL playback with new arrangement.
[dcpomatic.git]
/
src
/
wx
/
video_view.h
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index dda18058d4e6a4309aa31ffeed1b58ce87d77d95..827d1bf73d65a2f0e8a93c2c7d5c4862dd7ec834 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-21,12
+21,14
@@
#ifndef DCPOMATIC_VIDEO_VIEW_H
#define DCPOMATIC_VIDEO_VIEW_H
#ifndef DCPOMATIC_VIDEO_VIEW_H
#define DCPOMATIC_VIDEO_VIEW_H
+#include "lib/dcpomatic_time.h"
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
class Image;
class wxWindow;
class FilmViewer;
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
class Image;
class wxWindow;
class FilmViewer;
+class PlayerVideo;
class VideoView
{
class VideoView
{
@@
-47,10
+49,25
@@
public:
/* XXX_b: make pure */
virtual void start () {}
/* XXX_b: make pure */
virtual void start () {}
+ void clear ();
+
boost::signals2::signal<void()> Sized;
boost::signals2::signal<void()> Sized;
+ /* XXX_b: to remove */
+ virtual bool get (bool) {
+ return true;
+ }
+ /* XXX_b: to remove */
+ virtual void display_player_video () {}
+
protected:
protected:
+ /* XXX_b: to remove */
+ friend class FilmViewer;
+
+ bool get_next_frame (bool non_blocking);
+
FilmViewer* _viewer;
FilmViewer* _viewer;
+ std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
#ifdef DCPOMATIC_VARIANT_SWAROOP
bool _in_watermark;
#ifdef DCPOMATIC_VARIANT_SWAROOP
bool _in_watermark;