X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fwestley%2Fconsumer_westley.c;h=437d9f4c159f3adb8d298f74bd26b1e8c0009721;hb=6405eb05b56e753e9ab7c9ac2c16826d3a0c0ec5;hp=c1e68c19974a89e9b7f838b30cadb8eed66db1c0;hpb=dc57bd7b4020663b49149f44f1607c4d78c4d2d5;p=melted

diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c
index c1e68c1..437d9f4 100644
--- a/src/modules/westley/consumer_westley.c
+++ b/src/modules/westley/consumer_westley.c
@@ -46,9 +46,6 @@ mlt_consumer consumer_westley_init( char *arg )
 	// If no malloc'd and consumer init ok
 	if ( this != NULL && mlt_consumer_init( this, NULL ) == 0 )
 	{
-		// We have stuff to clean up, so override the close method
-		//parent->close = consumer_close;
-
 		// Allow thread to be started/stopped
 		this->start = consumer_start;
 		this->is_stopped = consumer_is_stopped;
@@ -94,16 +91,13 @@ static inline void serialise_properties( mlt_properties properties, xmlNode *nod
 		if ( name != NULL &&
 			 name[ 0 ] != '_' &&
 			 mlt_properties_get_value( properties, i ) != NULL &&
-			 strcmp( name, "westley" ) != 0 )
+			 strcmp( name, "westley" ) != 0 &&
+			 strcmp( name, "in" ) != 0 &&
+			 strcmp( name, "out" ) != 0 )
 		{
-#if 1
 			p = xmlNewChild( node, NULL, "property", NULL );
 			xmlNewProp( p, "name", mlt_properties_get_name( properties, i ) );
 			xmlNodeSetContent( p, mlt_properties_get_value( properties, i ) );
-#else
-			p = node;
-			xmlNewProp( p, mlt_properties_get_name( properties, i ), mlt_properties_get_value( properties, i ) );
-#endif
 		}
 	}
 }
@@ -225,9 +219,6 @@ static void serialise_service( serialise_context context, mlt_service service, x
 					else
 						strncpy( id, mlt_properties_get( properties, "id" ), ID_SIZE );
 
-					xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) );
-					xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
-
 					// Add producer to the map
 					snprintf( key, 10, "%p", service );
 					mlt_properties_set( context->producer_map, key, id );
@@ -250,6 +241,8 @@ static void serialise_service( serialise_context context, mlt_service service, x
 								xmlNode *entry = xmlNewChild( child, NULL, "entry", NULL );
 								snprintf( key, 10, "%p", MLT_SERVICE( info.producer ) );
 								xmlNewProp( entry, "producer", mlt_properties_get( context->producer_map, key ) );
+								xmlNewProp( entry, "in", mlt_properties_get( mlt_producer_properties( info.producer ), "in" ) );
+								xmlNewProp( entry, "out", mlt_properties_get( mlt_producer_properties( info.producer ), "out" ) );
 							}
 						}
 					}
@@ -305,6 +298,8 @@ static void serialise_service( serialise_context context, mlt_service service, x
 				{
 					snprintf( id, ID_SIZE, "filter%d", context->filter_count++ );
 					xmlNewProp( child, "id", id );
+					xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) );
+					xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
 				}
 
 				serialise_properties( properties, child );
@@ -327,6 +322,8 @@ static void serialise_service( serialise_context context, mlt_service service, x
 				{
 					snprintf( id, ID_SIZE, "transition%d", context->transition_count++ );
 					xmlNewProp( child, "id", id );
+					xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) );
+					xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
 				}
 
 				serialise_properties( properties, child );