X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=main.cpp;h=fd41e0bd67bafdd710935d119a11a42b9d355e94;hb=d7bba4abb3d56893399578f0540b9ded0a28380f;hp=e4df08946dcf7a1249f70c027d10ac2521f45f23;hpb=12677633d653f654e3d75c232206585aebb06362;p=nageru

diff --git a/main.cpp b/main.cpp
index e4df089..fd41e0b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,14 +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);
@@ -21,11 +35,16 @@ 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(mainWindow.sizeHint());
+	mainWindow.resize(QSize(1500, 606));
 	mainWindow.show();
 
 	int rc = app.exec();
-	mixer_quit();
+	global_mixer->quit();
+	delete global_mixer;
 	return rc;
 }