X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.h;h=b815afb7cc9da251283f21c3170fac3b0d53f1fc;hb=3b352d6c49e433f82212e7d3f7ae8ccdc28566dd;hp=d7d60c21da14b4e933af418a8ea79ad223fdc574;hpb=a7a8cd74f2f32de8b708c78cc8bc9c0cf17d60f5;p=dcpomatic.git

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index d7d60c21d..b815afb7c 100644
--- 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,29 @@ 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);
+	}
+
+	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;
@@ -157,6 +179,8 @@ protected:
 
 	StateTimer _state_timer;
 
+	bool _optimise_for_j2k = false;
+
 private:
 	/** Mutex protecting all the state in this class */
 	mutable boost::mutex _mutex;