void view_system_information ()
{
if (!_system_information_dialog) {
- _system_information_dialog = new SystemInformationDialog (this);
+ _system_information_dialog = new SystemInformationDialog (this, _film_viewer);
}
_system_information_dialog->Show ();
GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
: VideoView (viewer)
+ , _vsync_enabled (false)
{
_canvas = new wxGLCanvas (parent, wxID_ANY, 0, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE);
_context = new wxGLContext (_canvas);
/* Enable vsync */
Display* dpy = wxGetX11Display();
glXSwapIntervalEXT (dpy, DefaultScreen(dpy), 1);
+ _vsync_enabled = true;
}
#endif
if (_canvas->IsExtensionSupported("WGL_EXT_swap_control")) {
/* Enable vsync */
wglSwapIntervalEXT (1);
+ _vsync_enabled = true;
}
#endif
/* Enable vsync */
GLint swapInterval = 1;
CGLSetParameter (CGLGetCurrentContext(), kCGLCPSwapInterval, &swapInterval);
+ _vsync_enabled = true;
#endif
glGenTextures (1, &_id);
}
void update ();
+ bool vsync_enabled () const {
+ return _vsync_enabled;
+ }
+
private:
void paint ();
void draw ();
wxGLContext* _context;
GLuint _id;
boost::optional<dcp::Size> _size;
+ bool _vsync_enabled;
};
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "system_information_dialog.h"
#include "wx_util.h"
+#include "gl_video_view.h"
+#include "film_viewer.h"
#ifdef DCPOMATIC_OSX
#include <OpenGL/glu.h>
#endif
using std::string;
+using boost::weak_ptr;
+using boost::shared_ptr;
-SystemInformationDialog::SystemInformationDialog (wxWindow* parent)
+SystemInformationDialog::SystemInformationDialog (wxWindow* parent, weak_ptr<FilmViewer> weak_viewer)
: TableDialog (parent, _("System information"), 2, 1, false)
{
add (_("OpenGL version"), true);
add (_("unknown (OpenGL not enabled in DCP-o-matic)"), false);
}
+
add (_("vsync"), true);
-#if !defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_HAVE_GLX_SWAP_INTERVAL_EXT)
- add (_("enabled"), false);
-#else
- add (_("disabled"), false);
-#endif
+ shared_ptr<FilmViewer> viewer = weak_viewer.lock ();
+
+ if (!viewer) {
+ add (_("unknown"), false);
+ } else {
+ GLVideoView* gl = dynamic_cast<GLVideoView*>(viewer->panel());
+ if (!gl) {
+ add (_("unknown"), false);
+ } else {
+ add (gl->vsync_enabled() ? _("enabled") : _("not enabled"), false);
+ }
+ }
+
layout ();
}
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
#include "table_dialog.h"
+#include <boost/weak_ptr.hpp>
+
+class FilmViewer;
class SystemInformationDialog : public TableDialog
{
public:
- SystemInformationDialog (wxWindow* parent);
+ SystemInformationDialog (wxWindow* parent, boost::weak_ptr<FilmViewer> viewer);
};