Add support for Qt 5, drop support for Qt 3 and KDE 3.

[mlt] / src / modules / qimage / consumer_qglsl.cpp

diff --git a/src/modules/qimage/consumer_qglsl.cpp b/src/modules/qimage/consumer_qglsl.cpp
index 9ed99afbd54cbe6d67e62a46f634f4545beac851..660bb3b51a07f350261f4c10947233ef972dac9b 100644 (file)
--- a/src/modules/qimage/consumer_qglsl.cpp
+++ b/src/modules/qimage/consumer_qglsl.cpp
@@ -18,9 +18,9 @@
  */
 
 #include <framework/mlt.h>
-#include <QtGui/QApplication>
-#include <QtCore/QLocale>
-#include <QtOpenGL/QGLWidget>
+#include <QApplication>
+#include <QLocale>
+#include <QGLWidget>
 
 static void onThreadStarted(mlt_properties owner, mlt_consumer consumer)
 {
@@ -53,6 +53,20 @@ static void onThreadStarted(mlt_properties owner, mlt_consumer consumer)
                        "OpenGL Shading Language rendering is not supported on this machine.\n" );
                mlt_events_fire(properties, "consumer-fatal-error", NULL);
        }
+       else {
+               mlt_properties_set_data(properties, "qglslRenderContext", renderContext, 0, NULL, NULL);
+       }
+}
+
+static void onCleanup(mlt_properties owner, mlt_consumer consumer)
+{
+       QGLWidget* renderContext = (QGLWidget*) mlt_properties_get_data(
+               MLT_CONSUMER_PROPERTIES(consumer), "qglslRenderContext", NULL);
+       if (renderContext)
+               renderContext->makeCurrent();
+       delete renderContext;
+       mlt_properties_set_data(MLT_CONSUMER_PROPERTIES(consumer),
+               "qglslRenderContext", NULL, 0, NULL, NULL);
 }
 
 extern "C" {
@@ -65,7 +79,9 @@ mlt_consumer consumer_qglsl_init( mlt_profile profile, mlt_service_type type, co
                if (filter) {
                        mlt_properties properties = MLT_CONSUMER_PROPERTIES(consumer);
                        mlt_properties_set_data(properties, "glslManager", filter, 0, (mlt_destructor) mlt_filter_close, NULL);
+                       mlt_events_register( properties, "consumer-cleanup", NULL );
                        mlt_events_listen(properties, consumer, "consumer-thread-started", (mlt_listener) onThreadStarted);
+                       mlt_events_listen(properties, consumer, "consumer-cleanup", (mlt_listener) onCleanup);
                        return consumer;
                }
                mlt_consumer_close(consumer);