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
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 51419a54dc9c5cf29b139f8ea5af79754e1084cb..a59468c363579ab8a6d7d92c74c5fe47c2095e4b 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-119,7
+119,7
@@
public:
return _gets;
}
return _gets;
}
- /* Some accessors that VideoView classes need */
+ /* Some accessors
and utility methods
that VideoView classes need */
dcp::Size out_size () const {
return _out_size;
}
dcp::Size out_size () const {
return _out_size;
}
@@
-138,6
+138,7
@@
public:
boost::shared_ptr<Butler> butler () const {
return _butler;
}
boost::shared_ptr<Butler> butler () const {
return _butler;
}
+ int time_until_next_frame () const;
boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
boost::signals2::signal<void ()> PositionChanged;
boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
boost::signals2::signal<void ()> PositionChanged;
@@
-152,6
+153,8
@@
private:
/* XXX_b: to remove */
friend class SimpleVideoView;
/* XXX_b: to remove */
friend class SimpleVideoView;
+ friend class GLVideoView;
+ friend class VideoView;
void video_view_sized ();
void calculate_sizes ();
void video_view_sized ();
void calculate_sizes ();