projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 207004f29715b6a5958b478df586f24fb5124719..189b379bf3beeaa68f43a2d343220e307d891ece 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-28,7
+28,7
@@
class wxToggleButton;
class FFmpegPlayer;
class Image;
class RGBPlusAlphaImage;
class FFmpegPlayer;
class Image;
class RGBPlusAlphaImage;
-class Player
Image
;
+class Player
Video
;
/** @class FilmViewer
* @brief A wx widget to view a preview of a Film.
/** @class FilmViewer
* @brief A wx widget to view a preview of a Film.
@@
-75,4
+75,9
@@
private:
dcp::Size _out_size;
/** Size of the panel that we have available */
dcp::Size _panel_size;
dcp::Size _out_size;
/** Size of the panel that we have available */
dcp::Size _panel_size;
+ /** true if the last call to ::get() was specified to be accurate;
+ * this is used so that when re-fetching the current frame we
+ * can get the same one that we got last time.
+ */
+ bool _last_get_accurate;
};
};