Make the locut filter possible to disable.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index f96484469008d4b63728d866709269dda2fd227d..3d5b0f97abe86a494bedda4ee5607e14499a2be2 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -7,10 +7,10 @@
 #include <epoxy/gl.h>
 #include <epoxy/egl.h>
 #include <QSurfaceFormat>
+#include <movit/resource_pool.h>
 
 #include "glwidget.h"
 
-#include <movit/resource_pool.h>
 #include <stdio.h>
 #include <functional>
 #include <mutex>
@@ -33,19 +33,22 @@ class QWidget;
 using namespace std;
 
 GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(parent, global_share_widget),
-      resource_pool(new movit::ResourcePool)
+    : QGLWidget(parent, global_share_widget)
 {
 }
 
-GLWidget::~GLWidget()
+void GLWidget::clean_context()
 {
+       if (resource_pool != nullptr) {
+               makeCurrent();
+               resource_pool->clean_context();
+       }
 }
 
 void GLWidget::initializeGL()
 {
-       static std::once_flag flag;
-       std::call_once(flag, [this]{
+       static once_flag flag;
+       call_once(flag, [this]{
                global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()), global_flags.num_cards);
                global_mainwindow->mixer_created(global_mixer);
                global_mixer->start();
@@ -53,6 +56,7 @@ void GLWidget::initializeGL()
        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);
@@ -83,6 +87,12 @@ void GLWidget::paintGL()
        check_error();
        frame.chain->render_to_screen();
        check_error();
+
+       if (resource_pool == nullptr) {
+               resource_pool = frame.chain->get_resource_pool();
+       } else {
+               assert(resource_pool == frame.chain->get_resource_pool());
+       }
 }
 
 void GLWidget::mousePressEvent(QMouseEvent *event)