diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-13 00:52:16 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-27 13:41:46 +0200 |
| commit | f802565830bed9ec9e7ad6c16ccaa7b0700625d9 (patch) | |
| tree | c6eac87b0ad7fdf00eb92567c184b9afaa94dbb0 | |
| parent | 687ade428fb7ad6d0949f12aa5a7f5b643434489 (diff) | |
Rename _size -> _video_size
| -rw-r--r-- | src/wx/gl_video_view.cc | 12 | ||||
| -rw-r--r-- | src/wx/gl_video_view.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index 3dcf2ec6f..035d337e5 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -497,29 +497,29 @@ GLVideoView::set_image (shared_ptr<const PlayerVideo> pv) /* XXX: video range conversion */ /* XXX: subs */ - if (image->size() != _size) { + if (image->size() != _video_size) { _have_storage = false; } - _size = image->size (); + _video_size = image->size (); glPixelStorei (GL_UNPACK_ALIGNMENT, _optimise_for_j2k ? 2 : 1); check_gl_error ("glPixelStorei"); auto const format = _optimise_for_j2k ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE; if (_have_storage) { - glTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, _size->width, _size->height, GL_RGB, format, image->data()[0]); + glTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, _video_size->width, _video_size->height, GL_RGB, format, image->data()[0]); check_gl_error ("glTexSubImage2D"); } else { - glTexImage2D (GL_TEXTURE_2D, 0, _optimise_for_j2k ? GL_RGBA12 : GL_RGBA8, _size->width, _size->height, 0, GL_RGB, format, image->data()[0]); + glTexImage2D (GL_TEXTURE_2D, 0, _optimise_for_j2k ? GL_RGBA12 : GL_RGBA8, _video_size->width, _video_size->height, 0, GL_RGB, format, image->data()[0]); check_gl_error ("glTexImage2D"); auto const canvas_size = _canvas_size.load(); int const canvas_width = canvas_size.GetWidth(); int const canvas_height = canvas_size.GetHeight(); - float const image_x = float(_size->width) / canvas_width; - float const image_y = float(_size->height) / canvas_height; + float const image_x = float(_video_size->width) / canvas_width; + float const image_y = float(_video_size->height) / canvas_height; auto x_pixels_to_gl = [canvas_width](int x) { return (x * 2.0f / canvas_width) - 1.0f; diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h index b7b30696f..8f3f2dcb4 100644 --- a/src/wx/gl_video_view.h +++ b/src/wx/gl_video_view.h @@ -75,7 +75,7 @@ private: boost::atomic<wxSize> _canvas_size; GLuint _video_texture; - boost::optional<dcp::Size> _size; + boost::optional<dcp::Size> _video_size; bool _have_storage; bool _vsync_enabled; boost::thread _thread; |