X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_region.c;h=b75a2904329e2cb2d06a66dc9c5a0d57f7a6af8b;hb=bb52b9f3ce843820aca77ca7bc18adf1dcd61122;hp=4934d3bebdea36425d73124910552e318401ea32;hpb=05008d72aac63b4abca2bc51b9c6e73a722d5703;p=melted

diff --git a/src/modules/core/transition_region.c b/src/modules/core/transition_region.c
index 4934d3b..b75a290 100644
--- a/src/modules/core/transition_region.c
+++ b/src/modules/core/transition_region.c
@@ -3,19 +3,19 @@
  * 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 "transition_region.h"
@@ -46,7 +46,8 @@ static int create_instance( mlt_transition this, char *name, char *value, int co
 		*arg ++ = '\0';
 
 	// Create the filter
-	filter = mlt_factory_filter( type, arg );
+	mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( this ) );
+	filter = mlt_factory_filter( profile, type, arg );
 
 	// If we have a filter, then initialise and store it
 	if ( filter != NULL )
@@ -167,7 +168,8 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for
 	if ( composite == NULL )
 	{
 		// Create composite via the factory
-		composite = mlt_factory_transition( "composite", NULL );
+		mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( this ) );
+		composite = mlt_factory_transition( profile, "composite", NULL );
 
 		// If we have one
 		if ( composite != NULL )
@@ -336,16 +338,11 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for
 
 				// Special case circle resource
 				if ( strcmp( resource, "circle" ) == 0 )
-				{
-					// Special case to ensure that fezzik produces a pixbuf with a NULL constructor
-					resource = "pixbuf";
-
-					// Specify the svg circle
-					mlt_properties_set( properties, "producer.resource", "<svg width='100' height='100'><circle cx='50' cy='50' r='50' fill='black'/></svg>" );
-				}
+					resource = "pixbuf:<svg width='100' height='100'><circle cx='50' cy='50' r='50' fill='black'/></svg>";
 
-				// Create the producer 
-				producer = mlt_factory_producer( factory, resource );
+				// Create the producer
+				mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( this ) );
+				producer = mlt_factory_producer( profile, factory, resource );
 
 				// If we have one
 				if ( producer != NULL )
@@ -422,7 +419,7 @@ static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt
 /** Constructor for the transition.
 */
 
-mlt_transition transition_region_init( void *arg )
+mlt_transition transition_region_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	// Create a new transition
 	mlt_transition this = mlt_transition_new( );
@@ -441,6 +438,9 @@ mlt_transition transition_region_init( void *arg )
 		
 		// Resource defines the shape of the region
 		mlt_properties_set( properties, "resource", arg == NULL ? "rectangle" : arg );
+
+		// Inform apps and framework that this is a video only transition
+		mlt_properties_set_int( properties, "_transition_type", 1 );
 	}
 
 	// Return the transition