Propertly refcount the GlslManager.

[mlt] / src / modules / opengl / filter_glsl_manager.cpp

diff --git a/src/modules/opengl/filter_glsl_manager.cpp b/src/modules/opengl/filter_glsl_manager.cpp
index d941f8e9f2d6ec0710b63c0e26d53cd55e609844..e9924de0b4da55bc1c0172768ec7b3c51be49d5d 100644 (file)
--- a/src/modules/opengl/filter_glsl_manager.cpp
+++ b/src/modules/opengl/filter_glsl_manager.cpp
@@ -41,9 +41,11 @@ extern "C" {
 #include <GL/glx.h>
 #endif
 
-void deleteManager(GlslManager *p)
+void dec_ref_and_delete(GlslManager *p)
 {
-       delete p;
+       if (p->dec_ref() == 0) {
+               delete p;
+       }
 }
 
 GlslManager::GlslManager()
@@ -57,8 +59,7 @@ GlslManager::GlslManager()
        if ( filter ) {
                // Set the mlt_filter child in case we choose to override virtual functions.
                filter->child = this;
-               mlt_properties_set_data(mlt_global_properties(), "glslManager", this, 0,
-                       (mlt_destructor) deleteManager, NULL);
+               add_ref(mlt_global_properties());
 
                mlt_events_register( get_properties(), "init glsl", NULL );
                mlt_events_register( get_properties(), "close glsl", NULL );
@@ -86,6 +87,13 @@ GlslManager::~GlslManager()
        }
 }
 
+void GlslManager::add_ref(mlt_properties properties)
+{
+       inc_ref();
+       mlt_properties_set_data(properties, "glslManager", this, 0,
+           (mlt_destructor) dec_ref_and_delete, NULL);
+}
+
 GlslManager* GlslManager::get_instance()
 {
        return (GlslManager*) mlt_properties_get_data(mlt_global_properties(), "glslManager", 0);