summaryrefslogtreecommitdiff
path: root/src/wx/film_viewer.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-11-06 01:09:13 +0100
committerCarl Hetherington <cth@carlh.net>2020-01-08 21:56:47 +0100
commit805487369e57e5eb57911805ba6de78b653d79ad (patch)
tree73c07ac5f6617c915df2f50d695367d3d6c56a6c /src/wx/film_viewer.h
parent694a9f48880efd428c8137e975de3581ad0a75a9 (diff)
Various timing hacks and development.
Diffstat (limited to 'src/wx/film_viewer.h')
-rw-r--r--src/wx/film_viewer.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 6b6aa78f5..beb1a5d74 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -69,7 +69,7 @@ public:
void seek_by (dcpomatic::DCPTime by, bool accurate);
/** @return our `playhead' position; this may not lie exactly on a frame boundary */
dcpomatic::DCPTime position () const {
- return _video_position;
+ return _video_view->position();
}
dcpomatic::DCPTime one_video_frame () const;
@@ -159,7 +159,7 @@ private:
void calculate_sizes ();
void player_change (ChangeType type, int, bool);
void idle_handler ();
- void request_idle_get ();
+ void request_idle_display_next_frame ();
void film_change (ChangeType, Film::Property);
void recreate_butler ();
void config_changed (Config::Property);
@@ -178,7 +178,6 @@ private:
bool _coalesce_player_changes;
std::list<int> _pending_player_changes;
- dcpomatic::DCPTime _video_position;
Position<int> _inter_position;
dcp::Size _inter_size;