Put Image in dcpomatic:: to avoid Fastvideo name clash.

[dcpomatic.git] / src / wx / video_view.h

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index ad492bd435fec51707c7786239c2a96ddd9c3580..825273373b9bde74161c63a4c537058f4fab12c8 100644 (file)
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -30,10 +30,13 @@
 #include <boost/thread.hpp>
 #include <boost/noncopyable.hpp>
 
-class Image;
-class wxWindow;
 class FilmViewer;
 class PlayerVideo;
+class wxWindow;
+
+namespace dcpomatic {
+       class Image;
+}
 
 class VideoView : public ExceptionStore, public boost::noncopyable
 {
@@ -66,6 +69,11 @@ public:
                return _dropped;
        }
 
+       int errored () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _errored;
+       }
+
        int gets () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _gets;
@@ -107,7 +115,7 @@ public:
 
 protected:
        bool get_next_frame (bool non_blocking);
-       int time_until_next_frame () const;
+       boost::optional<int> time_until_next_frame () const;
        dcpomatic::DCPTime one_video_frame () const;
 
        int video_frame_rate () const {
@@ -157,6 +165,7 @@ private:
        bool _three_d;
 
        int _dropped;
+       int _errored;
        int _gets;
 };