using std::shared_ptr;
-SystemInformationDialog::SystemInformationDialog (wxWindow* parent, weak_ptr<FilmViewer> weak_viewer)
+#if wxCHECK_VERSION(3, 1, 0)
+
+SystemInformationDialog::SystemInformationDialog(wxWindow* parent, FilmViewer const& viewer)
: TableDialog (parent, _("System information"), 2, 1, false)
{
- auto viewer = weak_viewer.lock ();
- shared_ptr<const GLVideoView> gl;
- if (viewer) {
- gl = std::dynamic_pointer_cast<const GLVideoView>(viewer->video_view());
- }
+ auto gl = std::dynamic_pointer_cast<const GLVideoView>(viewer.video_view());
if (!gl) {
add (_("OpenGL version"), true);
add (_("unknown (OpenGL not enabled in DCP-o-matic)"), false);
} else {
- add (_("OpenGL version"), true);
- auto v = reinterpret_cast<char const *>(glGetString(GL_VERSION));
- if (v) {
- add (std_to_wx(v), false);
- } else {
- add (_("unknown"), false);
- }
+ auto information = gl->information();
+ auto add_string = [this, &information](GLenum name, wxString label) {
+ add (label, true);
+ auto i = information.find(name);
+ if (i != information.end()) {
+ add (std_to_wx(i->second), false);
+ } else {
+ add (_("unknown"), false);
+ }
+ };
+
+ add_string (GL_VENDOR, _("Vendor"));
+ add_string (GL_RENDERER, _("Renderer"));
+ add_string (GL_VERSION, _("Version"));
+ add_string (GL_SHADING_LANGUAGE_VERSION, _("Shading language version"));
+
add (_("vsync"), true);
add (gl->vsync_enabled() ? _("enabled") : _("not enabled"), false);
}
layout ();
}
+
+#else
+
+SystemInformationDialog::SystemInformationDialog(wxWindow* parent, FilmViewer const&)
+ : TableDialog (parent, _("System information"), 2, 1, false)
+{
+ add (_("OpenGL version"), true);
+ add (_("OpenGL renderer not supported by this DCP-o-matic version"), false);
+}
+
+#endif