Add a HTTP server for stream output.

[nageru] / main.cpp

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