X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fopengl%2Ffilter_movit_saturation.cpp;h=d23a0503063b7908616901e43e9e47ddaed230dd;hb=2c046e968db474d1eafbcf77b119495bf89e6ae5;hp=9e77c10ed25611a8b8dcbf954310bac155a21527;hpb=afc20d746d10420925f004a1ee156b1ada28e458;p=mlt

diff --git a/src/modules/opengl/filter_movit_saturation.cpp b/src/modules/opengl/filter_movit_saturation.cpp
index 9e77c10e..d23a0503 100644
--- a/src/modules/opengl/filter_movit_saturation.cpp
+++ b/src/modules/opengl/filter_movit_saturation.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/saturation_effect.h>
 
 static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
@@ -29,25 +29,21 @@ static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format
 	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( 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( filter, frame ) )
-			GlslManager::add_effect( filter, frame, new SaturationEffect() );
-	}
 	mlt_frame_push_service( frame, filter );
 	mlt_frame_push_get_image( frame, get_image );
 	return frame;