X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=main.cpp;h=b7679f90fb856255fbda9d3c4d8a1f7ef7deb0e9;hb=5c560f35dea9f3aa5f13c42f4a0112a4d05f2152;hp=b39fafe2c837d285d4ffb294726b710a0f8a06e2;hpb=340de19ccede5808c033e8706070731204b832a4;p=nageru

diff --git a/main.cpp b/main.cpp
index b39fafe..b7679f9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,15 +1,28 @@
+extern "C" {
+#include <libavformat/avformat.h>
+}
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <epoxy/gl.h>
+
 #include <QApplication>
-#include <QDesktopWidget>
+#include <QCoreApplication>
+#include <QGL>
+#include <QSize>
 #include <QSurfaceFormat>
-#include <QtGui/QOpenGLContext>
 
+#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);
+	setlinebuf(stdout);
+	av_register_all();
+	parse_flags(argc, argv);
 
 	QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
 	QApplication app(argc, argv);
@@ -22,11 +35,18 @@ int main(int argc, char *argv[])
 	fmt.setMinorVersion(1);
 	QSurfaceFormat::setDefaultFormat(fmt);
 
+	QGLFormat::setDefaultFormat(QGLFormat::fromSurfaceFormat(fmt));
+
+	global_share_widget = new QGLWidget();
+
 	MainWindow mainWindow;
-	mainWindow.resize(QSize(1280, 720));
+	mainWindow.resize(QSize(1500, 810));
 	mainWindow.show();
 
+	app.installEventFilter(&mainWindow);  // For white balance color picking.
+
 	int rc = app.exec();
-	mixer_quit();
+	global_mixer->quit();
+	delete global_mixer;
 	return rc;
 }