X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=a309240e342dd45488d19ba959fb66c0701b205b;hb=d7bba4abb3d56893399578f0540b9ded0a28380f;hp=2118ffe1c6dff368cc9b30604cead5b8af8bf7d0;hpb=24e4026778bfd87612d5bedce1bfa51455853bc3;p=nageru

diff --git a/glwidget.cpp b/glwidget.cpp
index 2118ffe..a309240 100644
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -9,19 +9,21 @@
 #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
@@ -47,10 +49,8 @@ void GLWidget::initializeGL()
 
 	static std::once_flag flag;
 	std::call_once(flag, [this]{
-		global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()));
-		global_mixer->set_audio_level_callback([this](float level){
-			global_vu_meter->set_level(level);
-		});
+		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]{
@@ -73,12 +73,17 @@ void GLWidget::paintGL()
 	Mixer::DisplayFrame frame;
 	if (!global_mixer->get_display_frame(output, &frame)) {
 		glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
+		check_error();
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+		check_error();
 		return;
 	}
 
+	check_error();
 	glWaitSync(frame.ready_fence.get(), /*flags=*/0, GL_TIMEOUT_IGNORED);
+	check_error();
 	frame.setup_chain();
+	check_error();
 	frame.chain->render_to_screen();
 	check_error();
 }