Hide the movit.parms properties from serialization.

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

diff --git a/src/modules/opengl/filter_movit_saturation.cpp b/src/modules/opengl/filter_movit_saturation.cpp
index 04d1d0a05095df1e935201a65a3a79976140e988..ba7f2e4207a65235cd7168e8fb7282b73ee80aff 100644 (file)
--- a/src/modules/opengl/filter_movit_saturation.cpp
+++ b/src/modules/opengl/filter_movit_saturation.cpp
@@ -24,30 +24,28 @@
 #include "filter_glsl_manager.h"
 #include <movit/saturation_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 );
        GlslManager::get_instance()->lock_service( frame );
-       Effect* effect = GlslManager::get_effect( MLT_FILTER_SERVICE( 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( "saturation",
-                       mlt_properties_anim_get_double( properties, "saturation", position, length ) );
-               assert(ok);
-       }
+       mlt_position position = mlt_filter_get_position( filter, frame );
+       mlt_position length = mlt_filter_get_length2( filter, frame );
+       mlt_properties_set_double( properties, "_movit.parms.float.saturation",
+               mlt_properties_anim_get_double( properties, "saturation", 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 SaturationEffect() );
+       *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( MLT_FILTER_SERVICE( filter ), frame ) )
-                       GlslManager::add_effect( MLT_FILTER_SERVICE( filter ), frame, new SaturationEffect() );
-       }
        mlt_frame_push_service( frame, filter );
        mlt_frame_push_get_image( frame, get_image );
        return frame;
@@ -62,6 +60,7 @@ mlt_filter filter_movit_saturation_init( mlt_profile profile, mlt_service_type t
 
        if ( glsl && ( filter = mlt_filter_new() ) ) {
                mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
+               glsl->add_ref( properties );
                mlt_properties_set( properties, "saturation", arg? arg : "1.0" );
                filter->process = process;
        }