X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_region.c;h=8fd8e8d6ab84e78a236e06dd2c58471471c39b04;hb=840ed660f312a32a1b5e15530bf6a79c7f7c3cb9;hp=b47eb37c183fedb35b544f8e995eede4c1d0a3b6;hpb=9ab18ed63c37a9ef65e06697ae25f5c198d788bb;p=melted

diff --git a/src/modules/core/filter_region.c b/src/modules/core/filter_region.c
index b47eb37..8fd8e8d 100644
--- a/src/modules/core/filter_region.c
+++ b/src/modules/core/filter_region.c
@@ -3,24 +3,24 @@
  * 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_region.h"
 #include "transition_region.h"
 
+#include <framework/mlt_filter.h>
 #include <framework/mlt.h>
 
 #include <stdio.h>
@@ -33,7 +33,7 @@
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
 	// Get the properties of the filter
-	mlt_properties properties = mlt_filter_properties( this );
+	mlt_properties properties = MLT_FILTER_PROPERTIES( this );
 
 	// Get the region transition
 	mlt_transition transition = mlt_properties_get_data( properties, "_transition", NULL );
@@ -42,15 +42,19 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 	if ( transition == NULL )
 	{
 		// Create the transition
-		transition = mlt_factory_transition( "region", NULL );
-
-		// Pass all properties down
-		mlt_properties_pass( mlt_transition_properties( transition ), properties, "" );
+		mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( this ) );
+		transition = mlt_factory_transition( profile, "region", NULL );
 
 		// Register with the filter
 		mlt_properties_set_data( properties, "_transition", transition, 0, ( mlt_destructor )mlt_transition_close, NULL );
+
+		// Pass a reference to this filter down
+		mlt_properties_set_data( MLT_TRANSITION_PROPERTIES( transition ), "_region_filter", this, 0, NULL, NULL );
 	}
 
+	// Pass all properties down
+	mlt_properties_pass( MLT_TRANSITION_PROPERTIES( transition ), properties, "" );
+
 	// Process the frame
 	return mlt_transition_process( transition, frame, NULL );
 }
@@ -58,7 +62,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_region_init( void *arg )
+mlt_filter filter_region_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	// Create a new filter
 	mlt_filter this = mlt_filter_new( );
@@ -67,13 +71,16 @@ mlt_filter filter_region_init( void *arg )
 	if ( this != NULL )
 	{
 		// Get the properties from the filter
-		mlt_properties properties = mlt_filter_properties( this );
+		mlt_properties properties = MLT_FILTER_PROPERTIES( this );
 
 		// Assign the filter process method
 		this->process = filter_process;
 
 		// Resource defines the shape of the region
 		mlt_properties_set( properties, "resource", arg == NULL ? "rectangle" : arg );
+
+		// Ensure that attached filters are handled privately
+		mlt_properties_set_int( properties, "_filter_private", 1 );
 	}
 
 	// Return the filter