X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fwestley%2Fproducer_westley.c;h=9ac5fa3b9819a04a9386e233d79b0a550bba80f4;hb=74268cd86c30a0af9f03981c799aa4bba253c6e9;hp=ad21f93c46734ddd7bb375ae58edea485dd4e4a5;hpb=dc57bd7b4020663b49149f44f1607c4d78c4d2d5;p=melted

diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c
index ad21f93..9ac5fa3 100644
--- a/src/modules/westley/producer_westley.c
+++ b/src/modules/westley/producer_westley.c
@@ -121,6 +121,8 @@ static void on_start_playlist( deserialise_context context, const xmlChar *name,
 	for ( ; atts != NULL && *atts != NULL; atts += 2 )
 	{
 		mlt_properties_set( properties, ( char* )atts[0], ( char* )atts[1] );
+
+		// Out will be overwritten later as we append, so we need to save it
 		if ( strcmp( atts[ 0 ], "out" ) == 0 )
 			mlt_properties_set( properties, "_westley.out", ( char* )atts[ 1 ] );
 	}
@@ -166,15 +168,23 @@ static void on_start_blank( deserialise_context context, const xmlChar *name, co
 
 static void on_start_entry_track( deserialise_context context, const xmlChar *name, const xmlChar **atts)
 {
-	// Look for the producer attribute
+	// Use a dummy service to hold properties to allow arbitratry nesting
+	mlt_service service = calloc( 1, sizeof( struct mlt_service_s ) );
+	mlt_service_init( service, NULL );
+
+	// Push the dummy service onto the stack
+	context_push_service( context, service );
+	
 	for ( ; atts != NULL && *atts != NULL; atts += 2 )
 	{
-		if ( strcmp( atts[0], "producer" ) == 0 )
+		mlt_properties_set( mlt_service_properties( service ), (char*) atts[0], (char*) atts[1] );
+		
+		// Look for the producer attribute
+		if ( strcmp( atts[ 0 ], "producer" ) == 0 )
 		{
 			if ( mlt_properties_get_data( context->producer_map, (char*) atts[1], NULL ) !=  NULL )
 				// Push the referenced producer onto the stack
 				context_push_service( context, MLT_SERVICE( mlt_properties_get_data( context->producer_map, (char*) atts[1], NULL ) ) );
-			break;
 		}
 	}
 }
@@ -270,6 +280,9 @@ static void on_end_track( deserialise_context context, const xmlChar *name )
 	// Get the producer from the stack
 	mlt_service producer = context_pop_service( context );
 
+	// Get the dummy track service from the stack
+	mlt_service track = context_pop_service( context );
+
 	// Get the multitrack from the stack
 	mlt_service service = context_pop_service( context );
 
@@ -278,8 +291,19 @@ static void on_end_track( deserialise_context context, const xmlChar *name )
 		MLT_PRODUCER( producer ),
 		mlt_multitrack_count( MLT_MULTITRACK( service ) ) );
 
+	// Set producer i/o if specified
+	if ( mlt_properties_get( mlt_service_properties( track ), "in" ) != NULL ||
+		mlt_properties_get( mlt_service_properties( track ), "out" ) != NULL )
+	{
+		mlt_producer_set_in_and_out( MLT_PRODUCER( producer ),
+			mlt_properties_get_position( mlt_service_properties( track ), "in" ),
+			mlt_properties_get_position( mlt_service_properties( track ), "out" ) );
+	}
+
 	// Push the multitrack back onto the stack
 	context_push_service( context, service );
+
+	mlt_service_close( track );
 }
 
 static void on_end_entry( deserialise_context context, const xmlChar *name )
@@ -287,17 +311,30 @@ static void on_end_entry( deserialise_context context, const xmlChar *name )
 	// Get the producer from the stack
 	mlt_service producer = context_pop_service( context );
 
+	// Get the dummy entry service from the stack
+	mlt_service entry = context_pop_service( context );
+
 	// Get the playlist from the stack
 	mlt_service service = context_pop_service( context );
 
 	// Append the producer to the playlist
-	mlt_playlist_append_io( MLT_PLAYLIST( service ),
-		MLT_PRODUCER( producer ),
-		mlt_properties_get_position( mlt_service_properties( producer ), "in" ),
-		mlt_properties_get_position( mlt_service_properties( producer ), "out" ) );
+	if ( mlt_properties_get( mlt_service_properties( entry ), "in" ) != NULL ||
+		mlt_properties_get( mlt_service_properties( entry ), "out" ) != NULL )
+	{
+		mlt_playlist_append_io( MLT_PLAYLIST( service ),
+			MLT_PRODUCER( producer ),
+			mlt_properties_get_position( mlt_service_properties( entry ), "in" ), 
+			mlt_properties_get_position( mlt_service_properties( entry ), "out" ) );
+	}
+	else
+	{
+		mlt_playlist_append( MLT_PLAYLIST( service ), MLT_PRODUCER( producer ) );
+	}
 
 	// Push the playlist back onto the stack
 	context_push_service( context, service );
+
+	mlt_service_close( entry );
 }
 
 static void on_end_tractor( deserialise_context context, const xmlChar *name )
@@ -335,8 +372,8 @@ static void on_end_producer( deserialise_context context, const xmlChar *name )
 		return;
 		
 	// Instatiate the producer
-	service = MLT_SERVICE( mlt_factory_producer( "fezzik", mlt_properties_get( properties, "resource" ) ) );
-	
+	if ( mlt_properties_get( properties, "resource" ) != NULL )
+		service = MLT_SERVICE( mlt_factory_producer( "fezzik", mlt_properties_get( properties, "resource" ) ) );
 	if ( service == NULL && mlt_properties_get( properties, "mlt_service" ) != NULL )
 	{
 		service = MLT_SERVICE( mlt_factory_producer( mlt_properties_get( properties, "mlt_service" ),