projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove swaroop variant.
[dcpomatic.git]
/
src
/
wx
/
video_view.h
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index f9e0670435ed13edaa2e919cc373e11d12a0a48d..4e0b89ed767b3891e2a98360d490c4efc1d56b7c 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-66,6
+66,11
@@
public:
return _dropped;
}
return _dropped;
}
+ int errored () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _errored;
+ }
+
int gets () const {
boost::mutex::scoped_lock lm (_mutex);
return _gets;
int gets () const {
boost::mutex::scoped_lock lm (_mutex);
return _gets;
@@
-137,12
+142,6
@@
protected:
FilmViewer* _viewer;
FilmViewer* _viewer;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- bool _in_watermark;
- int _watermark_x;
- int _watermark_y;
-#endif
-
StateTimer _state_timer;
private:
StateTimer _state_timer;
private:
@@
-157,6
+156,7
@@
private:
bool _three_d;
int _dropped;
bool _three_d;
int _dropped;
+ int _errored;
int _gets;
};
int _gets;
};