X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=main.cpp;h=6cf1ddec055275855fd30bcd8824cfd4e0bd1aaf;hb=6ccc929592ef239dc4d011d22facaf19d098567c;hp=6e95d18de6103415cad06f45c53036c70dd6069e;hpb=b4f16ea9f8969a3ba14be8cd9c88cfe00d19533b;p=nageru

diff --git a/main.cpp b/main.cpp
index 6e95d18..6cf1dde 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,3 +1,8 @@
+extern "C" {
+#include <libavformat/avformat.h>
+}
+#include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <epoxy/gl.h>
 
@@ -8,12 +13,20 @@
 #include <QSurfaceFormat>
 
 #include "context.h"
+#include "flags.h"
 #include "mainwindow.h"
 #include "mixer.h"
 
 int main(int argc, char *argv[])
 {
-	setenv("QT_XCB_GL_INTEGRATION", "xcb_egl", 0);
+	parse_flags(argc, argv);
+
+	if (global_flags.va_display.empty() ||
+	    global_flags.va_display[0] != '/') {
+		// We normally use EGL for zerocopy, but if we use VA against DRM
+		// instead of against X11, we turn it off, and then don't need EGL.
+		setenv("QT_XCB_GL_INTEGRATION", "xcb_egl", 0);
+	}
 	setlinebuf(stdout);
 	av_register_all();
 
@@ -33,11 +46,14 @@ int main(int argc, char *argv[])
 	global_share_widget = new QGLWidget();
 
 	MainWindow mainWindow;
-	mainWindow.resize(QSize(1500, 670));
+	mainWindow.resize(QSize(1500, 810));
 	mainWindow.show();
 
+	app.installEventFilter(&mainWindow);  // For white balance color picking.
+
 	int rc = app.exec();
 	global_mixer->quit();
+	mainWindow.mixer_shutting_down();
 	delete global_mixer;
 	return rc;
 }