X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fwestley%2Fconsumer_westley.c;h=bfb8591051ef9a8e29435726e47163d94f435d7f;hb=a450db7b8af164bcc71255fd74d406be98c9eb21;hp=4e8fbb045693f4c0dcac8a49e7ffb5b572278c6d;hpb=f44c1d4653f43c8e7a63e6c3895f6f1f0ee0103b;p=melted

diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c
index 4e8fbb0..bfb8591 100644
--- a/src/modules/westley/consumer_westley.c
+++ b/src/modules/westley/consumer_westley.c
@@ -179,7 +179,10 @@ static inline void serialise_properties( mlt_properties properties, xmlNode *nod
 			 mlt_properties_get_value( properties, i ) != NULL &&
 			 strcmp( name, "westley" ) != 0 &&
 			 strcmp( name, "in" ) != 0 &&
-			 strcmp( name, "out" ) != 0 )
+			 strcmp( name, "out" ) != 0 && 
+			 strcmp( name, "id" ) != 0 && 
+			 strcmp( name, "width" ) != 0 &&
+			 strcmp( name, "height" ) != 0 )
 		{
 			p = xmlNewChild( node, NULL, "property", NULL );
 			xmlNewProp( p, "name", mlt_properties_get_name( properties, i ) );
@@ -188,7 +191,7 @@ static inline void serialise_properties( mlt_properties properties, xmlNode *nod
 	}
 }
 
-static inline void serialise_producer_filters( serialise_context context, mlt_service service, xmlNode *node )
+static inline void serialise_service_filters( serialise_context context, mlt_service service, xmlNode *node )
 {
 	int i;
 	xmlNode *p;
@@ -202,12 +205,13 @@ static inline void serialise_producer_filters( serialise_context context, mlt_se
 		{
 			// Get a new id - if already allocated, do nothing
 			char *id = westley_get_id( context, mlt_filter_service( filter ), westley_filter );
-			if ( id == NULL )
-				continue;
-
-			p = xmlNewChild( node, NULL, "filter", NULL );
-			xmlNewProp( p, "id", id );
-			serialise_properties( properties, p );
+			if ( id != NULL )
+			{
+				p = xmlNewChild( node, NULL, "filter", NULL );
+				xmlNewProp( p, "id", id );
+				serialise_properties( properties, p );
+				serialise_service_filters( context, mlt_filter_service( filter ), p );
+			}
 		}
 	}
 }
@@ -229,7 +233,7 @@ static void serialise_producer( serialise_context context, mlt_service service,
 		// Set the id
 		xmlNewProp( child, "id", id );
 		serialise_properties( properties, child );
-		serialise_producer_filters( context, service, child );
+		serialise_service_filters( context, service, child );
 
 		// Add producer to the map
 		mlt_properties_set_int( context->hide_map, id, mlt_properties_get_int( properties, "hide" ) );
@@ -245,7 +249,6 @@ static void serialise_producer( serialise_context context, mlt_service service,
 static void serialise_multitrack( serialise_context context, mlt_service service, xmlNode *node )
 {
 	int i;
-	xmlNode *child = node;
 	
 	if ( context->pass == 0 )
 	{
@@ -260,16 +263,10 @@ static void serialise_multitrack( serialise_context context, mlt_service service
 		if ( id == NULL )
 			return;
 
-		// Create the multitrack node
-		child = xmlNewChild( node, NULL, "multitrack", NULL );
-		
-		// Set the id
-		xmlNewProp( child, "id", id );
-
 		// Serialise the tracks
 		for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ )
 		{
-			xmlNode *track = xmlNewChild( child, NULL, "track", NULL );
+			xmlNode *track = xmlNewChild( node, NULL, "track", NULL );
 			int hide = 0;
 			mlt_producer producer = mlt_multitrack_track( MLT_MULTITRACK( service ), i );
 
@@ -280,10 +277,12 @@ static void serialise_multitrack( serialise_context context, mlt_service service
 			if ( hide )
 				xmlNewProp( track, "hide", hide == 1 ? "video" : ( hide == 2 ? "audio" : "both" ) );
 		}
-		serialise_producer_filters( context, service, child );
+		serialise_service_filters( context, service, node );
 	}
 }
 
+static void serialise_tractor( serialise_context context, mlt_service service, xmlNode *node );
+
 static void serialise_playlist( serialise_context context, mlt_service service, xmlNode *node )
 {
 	int i;
@@ -307,7 +306,14 @@ static void serialise_playlist( serialise_context context, mlt_service service,
 				{
 					char *service_s = mlt_properties_get( mlt_producer_properties( info.producer ), "mlt_service" );
 					char *resource_s = mlt_properties_get( mlt_producer_properties( info.producer ), "resource" );
-					if ( service_s != NULL && strcmp( service_s, "blank" ) != 0 )
+					if ( resource_s != NULL && !strcmp( resource_s, "<tractor>" ) )
+					{
+						serialise_tractor( context, MLT_SERVICE( info.producer ), node );
+						context->pass ++;
+						serialise_tractor( context, MLT_SERVICE( info.producer ), node );
+						context->pass --;
+					}
+					else if ( service_s != NULL && strcmp( service_s, "blank" ) != 0 )
 						serialise_service( context, MLT_SERVICE( info.producer ), node );
 					else if ( resource_s != NULL && !strcmp( resource_s, "<playlist>" ) )
 						serialise_playlist( context, MLT_SERVICE( info.producer ), node );
@@ -351,7 +357,7 @@ static void serialise_playlist( serialise_context context, mlt_service service,
 			}
 		}
 
-		serialise_producer_filters( context, service, child );
+		serialise_service_filters( context, service, child );
 	}
 	else if ( strcmp( (const char*) node->name, "tractor" ) != 0 )
 	{
@@ -386,7 +392,7 @@ static void serialise_tractor( serialise_context context, mlt_service service, x
 
 		// Recurse on connected producer
 		serialise_service( context, mlt_service_producer( service ), child );
-		serialise_producer_filters( context, service, child );
+		serialise_service_filters( context, service, child );
 	}
 }
 
@@ -413,6 +419,7 @@ static void serialise_filter( serialise_context context, mlt_service service, xm
 		xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
 
 		serialise_properties( properties, child );
+		serialise_service_filters( context, service, child );
 	}
 }
 
@@ -439,6 +446,7 @@ static void serialise_transition( serialise_context context, mlt_service service
 		xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
 
 		serialise_properties( properties, child );
+		serialise_service_filters( context, service, child );
 	}
 }