summaryrefslogtreecommitdiff
path: root/src/wx/gl_video_view.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-09-13 13:57:20 +0200
committerCarl Hetherington <cth@carlh.net>2021-09-27 13:41:46 +0200
commit85647937291886a18f812f1fd6ac6d04e1cb7695 (patch)
tree65998a06a552f351db346465e672707ee594372f /src/wx/gl_video_view.h
parent56e0452ce0f436e7c54a49c68b272797f92a7ffe (diff)
Move some stuff inside Texture.
Diffstat (limited to 'src/wx/gl_video_view.h')
-rw-r--r--src/wx/gl_video_view.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 272198591..4e61b5b4c 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -38,16 +38,19 @@ DCPOMATIC_ENABLE_WARNINGS
class Texture
{
public:
- Texture ();
+ Texture (GLint unpack_alignment);
~Texture ();
Texture (Texture const&) = delete;
Texture& operator= (Texture const&) = delete;
void bind ();
+ bool set (std::shared_ptr<const Image> image);
private:
GLuint _name;
+ GLint _unpack_alignment;
+ boost::optional<dcp::Size> _size;
};
@@ -92,8 +95,6 @@ private:
boost::atomic<wxSize> _canvas_size;
std::unique_ptr<Texture> _video_texture;
- boost::optional<dcp::Size> _video_size;
- bool _have_storage;
bool _vsync_enabled;
boost::thread _thread;