X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fwestley%2Fproducer_westley.c;h=4921e78bb91cc13adc11ff35079f0ed9add9b278;hb=4bab66b2e702520181e5019632a921615557bf18;hp=276eecf6e22316e613c710ea760411839047d113;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted

diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c
index 276eecf..4921e78 100644
--- a/src/modules/westley/producer_westley.c
+++ b/src/modules/westley/producer_westley.c
@@ -294,7 +294,9 @@ static void on_start_tractor( deserialise_context context, const xmlChar *name,
 	track_service( context->destructors, service, (mlt_destructor) mlt_tractor_close );
 
 	for ( ; atts != NULL && *atts != NULL; atts += 2 )
-		mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (char*) atts[0], (char*) atts[1] );
+		mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
+
+	mlt_properties_set_int( MLT_TRACTOR_PROPERTIES( tractor ), "global_feed", 1 );
 
 	if ( mlt_properties_get( properties, "id" ) != NULL )
 		mlt_properties_set_data( context->producer_map, mlt_properties_get( properties, "id" ), service, 0, NULL, NULL );
@@ -348,7 +350,7 @@ static void on_start_multitrack( deserialise_context context, const xmlChar *nam
 		mlt_service service = MLT_SERVICE( mlt_tractor_multitrack( MLT_TRACTOR( parent ) ) );
 		mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
 		for ( ; atts != NULL && *atts != NULL; atts += 2 )
-			mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] );
+			mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
 
 		if ( mlt_properties_get( properties, "id" ) != NULL )
 			mlt_properties_set_data( context->producer_map, mlt_properties_get( properties,"id" ), service, 0, NULL, NULL );
@@ -382,7 +384,7 @@ 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] );
+		mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
 
 		// Out will be overwritten later as we append, so we need to save it
 		if ( strcmp( atts[ 0 ], "out" ) == 0 )
@@ -428,7 +430,7 @@ static void on_start_producer( deserialise_context context, const xmlChar *name,
 	context_push_service( context, service, mlt_dummy_producer_type );
 
 	for ( ; atts != NULL && *atts != NULL; atts += 2 )
-		mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] );
+		mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
 }
 
 static void on_end_producer( deserialise_context context, const xmlChar *name )
@@ -596,7 +598,7 @@ static void on_start_entry( deserialise_context context, const xmlChar *name, co
 
 	for ( ; atts != NULL && *atts != NULL; atts += 2 )
 	{
-		mlt_properties_set( temp, (char*) atts[0], (char*) atts[1] );
+		mlt_properties_set( temp, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
 		
 		// Look for the producer attribute
 		if ( strcmp( atts[ 0 ], "producer" ) == 0 )
@@ -679,7 +681,7 @@ static void on_start_track( deserialise_context context, const xmlChar *name, co
 	
 	for ( ; atts != NULL && *atts != NULL; atts += 2 )
 	{
-		mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (char*) atts[0], (char*) atts[1] );
+		mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
 		
 		// Look for the producer attribute
 		if ( strcmp( atts[ 0 ], "producer" ) == 0 )
@@ -929,9 +931,9 @@ static void on_start_property( deserialise_context context, const xmlChar *name,
 				value = (char*) atts[ 1 ];
 		}
 
-		if ( context->property != NULL && value != NULL )
-			mlt_properties_set( properties, context->property, value );
-	
+		if ( context->property != NULL )
+			mlt_properties_set( properties, context->property, value == NULL ? "" : value );
+
 		// Tell parser to collect any further nodes for serialisation
 		context->is_value = 1;
 
@@ -967,7 +969,7 @@ static void on_end_property( deserialise_context context, const xmlChar *name )
 			xmlFreeDoc( context->value_doc );
 			context->value_doc = NULL;
 		}
-	
+
 		// Close this property handling
 		free( context->property );
 		context->property = NULL;
@@ -1145,6 +1147,8 @@ static void on_internal_subset( void *ctx, const xmlChar* name,
 	params_to_entities( context );
 }
 
+// TODO: Check this with Dan... I think this is for westley parameterisation
+// but it's breaking standard escaped entities (like < etc).
 static void on_entity_declaration( void *ctx, const xmlChar* name, int type, 
 	const xmlChar* publicId, const xmlChar* systemId, xmlChar* content)
 {
@@ -1154,7 +1158,8 @@ static void on_entity_declaration( void *ctx, const xmlChar* name, int type,
 	xmlAddDocEntity( context->entity_doc, name, type, publicId, systemId, content );
 }
 
-xmlEntityPtr on_get_entity( void *ctx, const xmlChar* name )
+// TODO: Check this functionality (see on_entity_declaration)
+static xmlEntityPtr on_get_entity( void *ctx, const xmlChar* name )
 {
 	struct _xmlParserCtxt *xmlcontext = ( struct _xmlParserCtxt* )ctx;
 	deserialise_context context = ( deserialise_context )( xmlcontext->_private );
@@ -1171,11 +1176,15 @@ xmlEntityPtr on_get_entity( void *ctx, const xmlChar* name )
 	// Add our parameters if not already
 	params_to_entities( context );
 	
-	e = xmlGetDocEntity( context->entity_doc, name );
+	e = xmlGetPredefinedEntity( name );
 	
 	// Send signal to on_characters that an entity substitutin is pending
-	if ( e != NULL )
-		context->entity_is_replace = 1;
+	if ( e == NULL )
+	{
+		e = xmlGetDocEntity( context->entity_doc, name );
+		if ( e != NULL )
+			context->entity_is_replace = 1;
+	}
 	
 	return e;
 }
@@ -1247,10 +1256,25 @@ static void parse_url( mlt_properties properties, char *url )
 		mlt_properties_set( properties, name, value );
 }
 
+// Quick workaround to avoid unecessary libxml2 warnings
+static int file_exists( char *file )
+{
+	char *name = strdup( file );
+	int exists = 0;
+	if ( name != NULL && strchr( name, '?' ) )
+		*( strchr( name, '?' ) ) = '\0';
+	if ( name != NULL )
+	{
+		FILE *f = fopen( name, "r" );
+		exists = f != NULL;
+		if ( exists ) fclose( f );
+	}
+	free( name );
+	return exists;
+}
+
 mlt_producer producer_westley_init( int info, char *data )
 {
-	if ( data == NULL )
-		return NULL;
 	xmlSAXHandler *sax = calloc( 1, sizeof( xmlSAXHandler ) );
 	struct deserialise_context_s *context = calloc( 1, sizeof( struct deserialise_context_s ) );
 	mlt_properties properties = NULL;
@@ -1259,6 +1283,13 @@ mlt_producer producer_westley_init( int info, char *data )
 	int well_formed = 0;
 	char *filename = NULL;
 
+	if ( data == NULL || !strcmp( data, "" ) || ( info == 0 && !file_exists( data ) ) )
+		return NULL;
+
+	context = calloc( 1, sizeof( struct deserialise_context_s ) );
+	if ( context == NULL )
+		return NULL;
+
 	context->producer_map = mlt_properties_new();
 	context->destructors = mlt_properties_new();
 	context->params = mlt_properties_new();