+ Indicator for missing media replacement in case pango doesn't exist

[melted] / src / modules / westley / producer_westley.c

diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c
index 111a7e2..c9fe9bf 100644 (file)
--- a/src/modules/westley/producer_westley.c
+++ b/src/modules/westley/producer_westley.c
@@ -296,6 +296,8 @@ static void on_start_tractor( deserialise_context context, const xmlChar *name,
        for ( ; atts != NULL && *atts != NULL; atts += 2 )
                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 );
        
@@ -471,6 +473,9 @@ static void on_end_producer( deserialise_context context, const xmlChar *name )
                if ( producer == NULL )
                        producer = MLT_SERVICE( mlt_factory_producer( "fezzik", "+INVALID.txt" ) );
 
+               if ( producer == NULL )
+                       producer = MLT_SERVICE( mlt_factory_producer( "fezzik", "colour:red" ) );
+
                // Track this producer
                track_service( context->destructors, producer, (mlt_destructor) mlt_producer_close );
 
@@ -931,7 +936,7 @@ static void on_start_property( deserialise_context context, const xmlChar *name,
 
                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 +972,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 +1150,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 +1161,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 +1179,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 +1259,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 +1286,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();