projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move _player_video into VideoView.
[dcpomatic.git]
/
src
/
wx
/
video_view.h
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index 873df162b0c217cec81aa0c4fa0e929d0accac44..f4a8ea22bcf1b4c13087c2cfcc92ba13c9bb6ad8 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,6
+49,8
@@
public:
/* XXX_b: make pure */
virtual void start () {}
/* XXX_b: make pure */
virtual void start () {}
+ void clear ();
+
boost::signals2::signal<void()> Sized;
/* XXX_b: to remove */
boost::signals2::signal<void()> Sized;
/* XXX_b: to remove */
@@
-57,7
+61,11
@@
public:
virtual void display_player_video () {}
protected:
virtual void display_player_video () {}
protected:
+ /* XXX_b: to remove */
+ friend class FilmViewer;
+
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;