X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_obscure.c;h=7256f6ccac9b9bb4782429081ef843e4f85f63d0;hb=1971a6aa9301e7c841b7dda42eab6fff7d69763c;hp=d5521981472dad89b59382dccccebe38333ae99b;hpb=05008d72aac63b4abca2bc51b9c6e73a722d5703;p=melted

diff --git a/src/modules/core/filter_obscure.c b/src/modules/core/filter_obscure.c
index d552198..7256f6c 100644
--- a/src/modules/core/filter_obscure.c
+++ b/src/modules/core/filter_obscure.c
@@ -3,23 +3,22 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_obscure.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
@@ -256,8 +255,8 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 			struct geometry_s start;
 			struct geometry_s end;
 
-			// Calculate the position
-			float position = position_calculate( this, frame );
+			// Retrieve the position
+			float position = mlt_properties_get_double(frame_properties, "filter_position");
 
 			// Now parse the geometries
 			geometry_parse( &start, NULL, mlt_properties_get( properties, "start" ), normalised_width, normalised_height );
@@ -282,6 +281,10 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 	// Push this on to the service stack
 	mlt_frame_push_service( frame, this );
 	
+	// Calculate the position for the filter effect
+	float position = position_calculate( this, frame );
+	mlt_properties_set_double( MLT_FRAME_PROPERTIES( frame ), "filter_position", position );
+
 	// Push the get image call
 	mlt_frame_push_get_image( frame, filter_get_image );
 
@@ -291,7 +294,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_obscure_init( void *arg )
+mlt_filter filter_obscure_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	mlt_filter this = mlt_filter_new( );
 	if ( this != NULL )