X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=06675f346c85211030d0712097aa0db138b1fef6;hb=c9c43a2511ec88bf40aa720ba712577ba85a6863;hp=daadaf2f8d0e222efca7403e60226e20e86bfa46;hpb=20f3f885473309d6bf7474c5ca0341a237fb7414;p=nageru

diff --git a/glwidget.cpp b/glwidget.cpp
index daadaf2..06675f3 100644
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -9,19 +9,20 @@
 #include <QSurfaceFormat>
 
 #include "glwidget.h"
-#include "mainwindow.h"
 
-#include <movit/resource_pool.h>
 #include <stdio.h>
+#include <functional>
 #include <mutex>
 
 #include "context.h"
+#include "effect_chain.h"
+#include "flags.h"
+#include "mainwindow.h"
 #include "mixer.h"
+#include "qnamespace.h"
 #include "ref_counted_gl_sync.h"
-#include "vumeter.h"
 
-class MainWindow;
-class QSurface;
+class QMouseEvent;
 class QWidget;
 
 #undef Success
@@ -31,8 +32,7 @@ class QWidget;
 using namespace std;
 
 GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(parent, global_share_widget),
-      resource_pool(new movit::ResourcePool)
+    : QGLWidget(parent, global_share_widget)
 {
 }
 
@@ -42,18 +42,16 @@ GLWidget::~GLWidget()
 
 void GLWidget::initializeGL()
 {
-	printf("egl context=%p\n", eglGetCurrentContext());
-	//printf("threads: %p %p\n", QThread::currentThread(), qGuiApp->thread());
-
 	static std::once_flag flag;
 	std::call_once(flag, [this]{
-		global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()));
+		global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()), global_flags.num_cards);
 		global_mainwindow->mixer_created(global_mixer);
 		global_mixer->start();
 	});
 	global_mixer->set_frame_ready_callback(output, [this]{
 		QMetaObject::invokeMethod(this, "update", Qt::AutoConnection);
 		emit transition_names_updated(global_mixer->get_transition_names());
+		emit resolution_updated(output);
 	});
 
 	glDisable(GL_BLEND);