projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move _state_timer into VideoView.
[dcpomatic.git]
/
src
/
wx
/
video_view.cc
diff --git
a/src/wx/video_view.cc
b/src/wx/video_view.cc
index ede0708c220a6eecb434df4bfd9a3a36978863f4..e6588865641670b388a2643c761d7d070547902a 100644
(file)
--- a/
src/wx/video_view.cc
+++ b/
src/wx/video_view.cc
@@
-23,6
+23,18
@@
#include "film_viewer.h"
#include "lib/butler.h"
#include "film_viewer.h"
#include "lib/butler.h"
+VideoView::VideoView (FilmViewer* viewer)
+ : _viewer (viewer)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , _in_watermark (false)
+#endif
+ , _state_timer ("viewer")
+ , _video_frame_rate (0)
+ , _dropped (0)
+{
+
+}
+
void
VideoView::clear ()
{
void
VideoView::clear ()
{
@@
-85,3
+97,9
@@
VideoView::time_until_next_frame () const
return (next.seconds() - time.seconds()) * 1000;
}
return (next.seconds() - time.seconds()) * 1000;
}
+void
+VideoView::start ()
+{
+ boost::mutex::scoped_lock lm (_mutex);
+ _dropped = 0;
+}