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

diff --git a/main.cpp b/main.cpp
index b39fafe..6e95d18 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,15 +1,21 @@
+#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 "mainwindow.h"
 #include "mixer.h"
 
 int main(int argc, char *argv[])
 {
 	setenv("QT_XCB_GL_INTEGRATION", "xcb_egl", 0);
+	setlinebuf(stdout);
+	av_register_all();
 
 	QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
 	QApplication app(argc, argv);
@@ -22,11 +28,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(QSize(1280, 720));
+	mainWindow.resize(QSize(1500, 670));
 	mainWindow.show();
 
 	int rc = app.exec();
-	mixer_quit();
+	global_mixer->quit();
+	delete global_mixer;
 	return rc;
 }