Hide the movit.parms properties from serialization.

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

diff --git a/src/modules/opengl/filter_movit_glow.cpp b/src/modules/opengl/filter_movit_glow.cpp
index b333359771e6f4a639085c12784a22719e11a0e8..4ee0f8589a97eea893f2e58ea48a6afc6a0d56f5 100644 (file)
--- a/src/modules/opengl/filter_movit_glow.cpp
+++ b/src/modules/opengl/filter_movit_glow.cpp
@@ -21,37 +21,35 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/glow_effect.h>
 
+using namespace movit;
+
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
        mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );
        mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
+       mlt_position position = mlt_filter_get_position( filter, frame );
+       mlt_position length = mlt_filter_get_length2( filter, frame );
        GlslManager::get_instance()->lock_service( frame );
-       Effect* effect = GlslManager::get_effect( filter, frame );
-       if ( effect ) {
-               mlt_position position = mlt_filter_get_position( filter, frame );
-               mlt_position length = mlt_filter_get_length2( filter, frame );
-               bool ok = effect->set_float( "radius",
-                       mlt_properties_anim_get_double( properties, "radius", position, length ) );
-               ok |= effect->set_float( "blurred_mix_amount",
-                       mlt_properties_anim_get_double( properties, "blur_mix", position, length ) );
-               ok |= effect->set_float( "highlight_cutoff",
-                       mlt_properties_anim_get_double( properties, "highlight_cutoff", position, length ) );
-               assert(ok);
-       }
+       mlt_properties_set_double( properties, "_movit.parms.float.radius",
+               mlt_properties_anim_get_double( properties, "radius", position, length ) );
+       mlt_properties_set_double( properties, "_movit.parms.float.blurred_mix_amount",
+               mlt_properties_anim_get_double( properties, "blur_mix", position, length ) );
+       mlt_properties_set_double( properties, "_movit.parms.float.highlight_cutoff",
+               mlt_properties_anim_get_double( properties, "highlight_cutoff", position, length ) );
        GlslManager::get_instance()->unlock_service( frame );
        *format = mlt_image_glsl;
-       return mlt_frame_get_image( frame, image, format, width, height, writable );
+       int error = mlt_frame_get_image( frame, image, format, width, height, writable );
+       GlslManager::set_effect_input( MLT_FILTER_SERVICE( filter ), frame, (mlt_service) *image );
+       GlslManager::set_effect( MLT_FILTER_SERVICE( filter ), frame, new GlowEffect );
+       *image = (uint8_t *) MLT_FILTER_SERVICE( filter );
+       return error;
 }
 
 static mlt_frame process( mlt_filter filter, mlt_frame frame )
 {
-       if ( !mlt_frame_is_test_card( frame ) ) {
-               if ( !GlslManager::get_effect( filter, frame ) )
-                       GlslManager::add_effect( filter, frame, new GlowEffect() );
-       }
        mlt_frame_push_service( frame, filter );
        mlt_frame_push_get_image( frame, get_image );
        return frame;
@@ -66,6 +64,7 @@ mlt_filter filter_movit_glow_init( mlt_profile profile, mlt_service_type type, c
 
        if ( glsl && ( filter = mlt_filter_new() ) ) {
                mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
+               glsl->add_ref( properties );
                mlt_properties_set_double( properties, "radius", 20.0 );
                mlt_properties_set_double( properties, "blur_mix", 1.0 );
                mlt_properties_set_double( properties, "highlight_cutoff", 0.2 );