projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract ublas_to_gl method.
[dcpomatic.git]
/
src
/
wx
/
gl_video_view.h
diff --git
a/src/wx/gl_video_view.h
b/src/wx/gl_video_view.h
index 7ef7b565aaa2fa00f787a8eb212bfc4ab1a30fe0..fd9154a7338d946a8c1b31a619adde843f9f4324 100644
(file)
--- a/
src/wx/gl_video_view.h
+++ b/
src/wx/gl_video_view.h
@@
-19,12
+19,12
@@
*/
*/
-#include "lib/warnings.h"
-
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/glcanvas.h>
#include <wx/wx.h>
#include <wx/glcanvas.h>
#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+
/* The OpenGL API in wxWidgets 3.0.x is sufficiently different to make it awkward to support,
* and I think it may even have things missing that we require (e.g. the attributes parameter
/* The OpenGL API in wxWidgets 3.0.x is sufficiently different to make it awkward to support,
* and I think it may even have things missing that we require (e.g. the attributes parameter
@@
-91,7
+91,7
@@
public:
private:
void set_image (std::shared_ptr<const PlayerVideo> pv);
void set_image_and_draw ();
private:
void set_image (std::shared_ptr<const PlayerVideo> pv);
void set_image_and_draw ();
- void draw (
Position<int> inter_position, dcp::Size inter_size
);
+ void draw ();
void thread ();
void thread_playing ();
void request_one_shot ();
void thread ();
void thread_playing ();
void request_one_shot ();
@@
-99,7
+99,8
@@
private:
void ensure_context ();
void size_changed (wxSizeEvent const &);
void setup_shaders ();
void ensure_context ();
void size_changed (wxSizeEvent const &);
void setup_shaders ();
- void set_border_colour (GLuint program);
+ void set_outline_content_colour (GLuint program);
+ void set_crop_guess_colour (GLuint program);
wxGLCanvas* _canvas;
wxGLContext* _context;
wxGLCanvas* _canvas;
wxGLContext* _context;
@@
-130,6
+131,7
@@
private:
Last<Position<int>> _last_inter_position;
Last<dcp::Size> _last_inter_size;
Last<dcp::Size> _last_out_size;
Last<Position<int>> _last_inter_position;
Last<dcp::Size> _last_inter_size;
Last<dcp::Size> _last_out_size;
+ Last<boost::optional<dcpomatic::Rect<float>>> _last_crop_guess;
boost::atomic<wxSize> _canvas_size;
std::unique_ptr<Texture> _video_texture;
boost::atomic<wxSize> _canvas_size;
std::unique_ptr<Texture> _video_texture;