Move Image::as_png() out to image_as_png().

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

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index d7d60c21da14b4e933af418a8ea79ad223fdc574..a1cc41f072d88f6df06ad60648dbb8e33c30c37a 100644 (file)
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -28,15 +28,19 @@
 #include "lib/signaller.h"
 #include "lib/timer.h"
 #include "lib/types.h"
+#include <dcp/warnings.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
@@ -126,11 +130,25 @@ 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;
        dcpomatic::DCPTime one_video_frame () const;
 
+       wxColour pad_colour () const;
+
+       wxColour outline_content_colour () const {
+               return wxColour(255, 0, 0);
+       }
+
+       wxColour outline_subtitles_colour () const {
+               return wxColour(0, 255, 0);
+       }
+
        int video_frame_rate () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_frame_rate;
@@ -157,6 +175,8 @@ protected:
 
        StateTimer _state_timer;
 
+       bool _optimise_for_j2k = false;
+
 private:
        /** Mutex protecting all the state in this class */
        mutable boost::mutex _mutex;