Fix warning cause by previous libdcp bump.

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

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 9517a3bf479a2f31b8d9c7fdfbff955fa29e9509..387cca9f6a0a86dda8804fe3e2ad4c92e6d6baf5 100644 (file)
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -28,16 +28,20 @@
 #include "lib/signaller.h"
 #include "lib/timer.h"
 #include "lib/types.h"
+#include <dcp/warnings.h>
+#include <dcp/types.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 
 
-class Image;
-class wxWindow;
 class FilmViewer;
+class Image;
 class Player;
 class PlayerVideo;
+class wxWindow;
 
 
 class VideoView : public ExceptionStore, public Signaller
@@ -127,6 +131,10 @@ public:
                _three_d = t;
        }
 
+       void set_optimise_for_j2k (bool o) {
+               _optimise_for_j2k = o;
+       }
+
 protected:
        NextFrameResult get_next_frame (bool non_blocking);
        boost::optional<int> time_until_next_frame () const;
@@ -142,6 +150,10 @@ protected:
                return wxColour(0, 255, 0);
        }
 
+       wxColour crop_guess_colour () const {
+               return wxColour(0, 0, 255);
+       }
+
        int video_frame_rate () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_frame_rate;
@@ -168,6 +180,8 @@ protected:
 
        StateTimer _state_timer;
 
+       bool _optimise_for_j2k = false;
+
 private:
        /** Mutex protecting all the state in this class */
        mutable boost::mutex _mutex;