*/
#include "gl_video_view.h"
+#include "film_viewer.h"
#include "lib/image.h"
#include "lib/dcpomatic_assert.h"
#include "lib/exceptions.h"
using std::cout;
using boost::shared_ptr;
+using boost::optional;
-GLVideoView::GLVideoView (wxWindow *parent)
+GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
+ : VideoView (viewer)
{
_canvas = new wxGLCanvas (parent, wxID_ANY, 0, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE);
_context = new wxGLContext (_canvas);
- _canvas->Bind (wxEVT_PAINT, boost::bind(&GLVideoView::paint, this, _1));
+ _canvas->Bind (wxEVT_PAINT, boost::bind(&GLVideoView::paint, this));
_canvas->Bind (wxEVT_SIZE, boost::bind(boost::ref(Sized)));
glGenTextures (1, &_id);
{
glDeleteTextures (1, &_id);
delete _context;
- /* XXX: should we delete this? */
- delete _canvas;
}
static void
-check_gl_error (char const * last)
+ check_gl_error (char const * last)
{
GLenum const e = glGetError ();
if (e != GL_NO_ERROR) {
}
void
-GLVideoView::paint (wxPaintEvent &)
+GLVideoView::paint ()
{
+ _viewer->state_timer().set("paint-panel");
_canvas->SetCurrent (*_context);
wxPaintDC dc (_canvas);
+ draw ();
+ _viewer->state_timer().unset();
+}
+
+void
+GLVideoView::update ()
+{
+ if (!_canvas->IsShownOnScreen()) {
+ return;
+ }
+ wxClientDC dc (_canvas);
+ draw ();
+}
+
+void
+GLVideoView::draw ()
+{
glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
check_gl_error ("glClear");
check_gl_error ("glClearColor");
glEnable (GL_TEXTURE_2D);
check_gl_error ("glEnable GL_TEXTURE_2D");
- glEnable (GL_COLOR_MATERIAL);
- check_gl_error ("glEnable GL_COLOR_MATERIAL");
glEnable (GL_BLEND);
check_gl_error ("glEnable GL_BLEND");
glDisable (GL_DEPTH_TEST);
check_gl_error ("glDisable GL_DEPTH_TEST");
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ if (_canvas->GetSize().x < 64 || _canvas->GetSize().y < 0) {
+ return;
+ }
+
glViewport (0, 0, _canvas->GetSize().x, _canvas->GetSize().y);
+ check_gl_error ("glViewport");
glMatrixMode (GL_PROJECTION);
glLoadIdentity ();
gluOrtho2D (0, _canvas->GetSize().x, _canvas->GetSize().y, 0);
+ check_gl_error ("gluOrtho2d");
glMatrixMode (GL_MODELVIEW);
glLoadIdentity ();
glEnd ();
}
+ dcp::Size const out_size = _viewer->out_size ();
+ wxSize const canvas_size = _canvas->GetSize ();
+
+ if (!_viewer->pad_black() && out_size.width < canvas_size.GetWidth()) {
+ glBegin (GL_QUADS);
+ /* XXX: these colours are right for GNOME; may need adjusting for other OS */
+ glColor3ub (240, 240, 240);
+ glVertex2f (out_size.width, 0);
+ glVertex2f (canvas_size.GetWidth(), 0);
+ glVertex2f (canvas_size.GetWidth(), canvas_size.GetHeight());
+ glVertex2f (out_size.width, canvas_size.GetHeight());
+ glEnd ();
+ glColor3ub (255, 255, 255);
+ }
+
+ if (!_viewer->pad_black() && out_size.height < canvas_size.GetHeight()) {
+ glColor3ub (240, 240, 240);
+ int const gap = (canvas_size.GetHeight() - out_size.height) / 2;
+ glBegin (GL_QUADS);
+ glVertex2f (0, 0);
+ glVertex2f (canvas_size.GetWidth(), 0);
+ glVertex2f (canvas_size.GetWidth(), gap);
+ glVertex2f (0, gap);
+ glEnd ();
+ glBegin (GL_QUADS);
+ glVertex2f (0, gap + out_size.height + 1);
+ glVertex2f (canvas_size.GetWidth(), gap + out_size.height + 1);
+ glVertex2f (canvas_size.GetWidth(), 2 * gap + out_size.height + 2);
+ glVertex2f (0, 2 * gap + out_size.height + 2);
+ glEnd ();
+ glColor3ub (255, 255, 255);
+ }
+
+ if (_viewer->outline_content()) {
+ glColor3ub (255, 0, 0);
+ glBegin (GL_LINE_LOOP);
+ Position<int> inter_position = _viewer->inter_position ();
+ dcp::Size inter_size = _viewer->inter_size ();
+ glVertex2f (inter_position.x, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2);
+ glVertex2f (inter_position.x + inter_size.width, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2);
+ glVertex2f (inter_position.x + inter_size.width, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2 + inter_size.height);
+ glVertex2f (inter_position.x, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2 + inter_size.height);
+ glEnd ();
+ glColor3ub (255, 255, 255);
+ }
+
glFlush();
_canvas->SwapBuffers();
}
void
GLVideoView::set_image (shared_ptr<const Image> image)
{
+ if (!image) {
+ _size = optional<dcp::Size>();
+ return;
+ }
+
DCPOMATIC_ASSERT (image->pixel_format() == AV_PIX_FMT_RGB24);
DCPOMATIC_ASSERT (!image->aligned());
_size = image->size ();
glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+ check_gl_error ("glPixelStorei");
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB8, _size->width, _size->height, 0, GL_RGB, GL_UNSIGNED_BYTE, image->data()[0]);
check_gl_error ("glTexImage2D");