bugfixes to westley
[melted] / src / modules / westley / consumer_westley.c
index ceba61b..3b37440 100644 (file)
@@ -26,6 +26,8 @@
 #include <pthread.h>
 #include <libxml/tree.h>
 
+#define ID_SIZE 128
+
 /** Forward references to static functions.
 */
 
@@ -72,6 +74,8 @@ struct serialise_context_s
        int tractor_count;
        int filter_count;
        int transition_count;
+       int pass;
+       mlt_properties producer_map;
 };
 typedef struct serialise_context_s* serialise_context;
 
@@ -84,7 +88,8 @@ static inline void serialise_properties( mlt_properties properties, xmlNode *nod
        // Enumerate the properties
        for ( i = 0; i < mlt_properties_count( properties ); i++ )
        {
-               if ( mlt_properties_get_value( properties, i ) != NULL )
+               if ( mlt_properties_get_value( properties, i ) != NULL &&
+                       strcmp( mlt_properties_get_name( properties, i ), "westley" ) != 0 )
                {
 #if 0
                        p = xmlNewChild( node, NULL, "prop", NULL );
@@ -100,8 +105,10 @@ static void serialise_service( serialise_context context, mlt_service service, x
 {
        int i;
        xmlNode *child = node;
-       char id[ 31 ];
-       id[ 30 ] = '\0';
+       char id[ ID_SIZE + 1 ];
+       char key[ 11 ];
+       id[ ID_SIZE ] = '\0';
+       key[ 10 ] = '\0';
        
        // Iterate over consumer/producer connections
        while ( service != NULL )
@@ -112,16 +119,31 @@ static void serialise_service( serialise_context context, mlt_service service, x
                // Tell about the producer
                if ( strcmp( mlt_type, "producer" ) == 0 )
                {
-                       child = xmlNewChild( node, NULL, "producer", NULL );
+                       if ( context->pass == 0 )
+                       {
+                               child = xmlNewChild( node, NULL, "producer", NULL );
+
+                               // Set the id
+                               if ( mlt_properties_get( properties, "id" ) == NULL )
+                               {
+                                       snprintf( id, ID_SIZE, "producer%d", context->producer_count++ );
+                                       xmlNewProp( child, "id", id );
+                               }
+                               else
+                                       strncpy( id, mlt_properties_get( properties, "id" ), ID_SIZE );
+                               serialise_properties( properties, child );
 
-                       // Set the id
-                       if ( mlt_properties_get( properties, "id" ) == NULL )
+                               // Add producer to the map
+                               snprintf( key, 10, "%p", service );
+                               mlt_properties_set( context->producer_map, key, id );
+                       }
+                       else
                        {
-                               snprintf( id, 30, "producer%d", context->producer_count++ );
-                               xmlNewProp( child, "id", id );
+                               snprintf( key, 10, "%p", service );
+                               xmlNewProp( node, "producer", mlt_properties_get( context->producer_map, key ) );
                        }
-                       
-            serialise_properties( properties, child );
+                       if ( mlt_properties_get( properties, "westley" ) != NULL )
+                               break;
                }
 
                // Tell about the framework container producers
@@ -130,20 +152,38 @@ static void serialise_service( serialise_context context, mlt_service service, x
                        // Recurse on multitrack's tracks
                        if ( strcmp( mlt_properties_get( properties, "resource" ), "<multitrack>" ) == 0 )
                        {
-                               child = xmlNewChild( node, NULL, "multitrack", NULL );
-                               
-                               // Set the id
-                               if ( mlt_properties_get( properties, "id" ) == NULL )
+                               if ( context->pass == 0 )
                                {
-                                       snprintf( id, 30, "multitrack%d", context->multitrack_count++ );
-                                       xmlNewProp( child, "id", id );
+                                       // Iterate over the tracks
+                                       for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ )
+                                       {
+                                               serialise_service( context, MLT_SERVICE( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) ), node );
+                                       }
                                }
-
-                               // Iterate over the tracks
-                               for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ )
+                               else
                                {
-                                       xmlNode *track = xmlNewChild( child, NULL, "track", NULL );
-                                       serialise_service( context, MLT_SERVICE( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) ), track );
+                                       // Iterate over the tracks to collect the producers
+                                       for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ )
+                                       {
+                                               serialise_service( context, MLT_SERVICE( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) ), node );
+                                       }
+
+                                       child = xmlNewChild( node, NULL, "multitrack", NULL );
+                               
+                                       // Set the id
+                                       if ( mlt_properties_get( properties, "id" ) == NULL )
+                                       {
+                                               snprintf( id, ID_SIZE, "multitrack%d", context->multitrack_count++ );
+                                               xmlNewProp( child, "id", id );
+                                       }
+
+                                       // Iterate over the tracks
+                                       for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ )
+                                       {
+                                               xmlNode *track = xmlNewChild( child, NULL, "track", NULL );
+                                               snprintf( key, 10, "%p", MLT_SERVICE( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) ) );
+                                               xmlNewProp( track, "producer", mlt_properties_get( context->producer_map, key ) );
+                                       }
                                }
                                break;
                        }
@@ -152,55 +192,93 @@ static void serialise_service( serialise_context context, mlt_service service, x
                        else if ( strcmp( mlt_properties_get( properties, "resource" ), "<playlist>" ) == 0 )
                        {
                                mlt_playlist_clip_info info;
-                               child = xmlNewChild( node, NULL, "playlist", NULL );
-                               
-                               // Set the id
-                               if ( mlt_properties_get( properties, "id" ) == NULL )
-                               {
-                                       snprintf( id, 30, "playlist%d", context->playlist_count++ );
-                                       xmlNewProp( child, "id", id );
-                               }
-
-                               xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) );
-                               xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
 
-                               // Iterate over the playlist entries
-                               for ( i = 0; i < mlt_playlist_count( MLT_PLAYLIST( service ) ); i++ )
+                               if ( context->pass == 0 )
                                {
-                                       if ( ! mlt_playlist_get_clip_info( MLT_PLAYLIST( service ), &info, i ) )
+                                       // Iterate over the playlist entries to collect the producers
+                                       for ( i = 0; i < mlt_playlist_count( MLT_PLAYLIST( service ) ); i++ )
                                        {
-                                               if ( strcmp( mlt_properties_get( mlt_producer_properties( info.producer ), "mlt_service" ), "blank" ) == 0 )
+                                               if ( ! mlt_playlist_get_clip_info( MLT_PLAYLIST( service ), &info, i ) )
                                                {
-                                                       char length[ 20 ];
-                                                       length[ 19 ] = '\0';
-                                                       xmlNode *entry = xmlNewChild( child, NULL, "blank", NULL );
-                                                       snprintf( length, 19, "%lld", info.frame_count );
-                                                       xmlNewProp( entry, "length", length );
+                                                       if ( strcmp( mlt_properties_get( mlt_producer_properties( info.producer ), "mlt_service" ), "blank" ) != 0 )
+                                                       {
+                                                               serialise_service( context, MLT_SERVICE( info.producer ), node );
+                                                       }
                                                }
-                                               else
+                                       }
+                                       
+                                       child = xmlNewChild( node, NULL, "playlist", NULL );
+
+                                       // Set the id
+                                       if ( mlt_properties_get( properties, "id" ) == NULL )
+                                       {
+                                               snprintf( id, ID_SIZE, "playlist%d", context->playlist_count++ );
+                                               xmlNewProp( child, "id", id );
+                                       }
+                                       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 );
+                               
+                                       // Iterate over the playlist entries
+                                       for ( i = 0; i < mlt_playlist_count( MLT_PLAYLIST( service ) ); i++ )
+                                       {
+                                               if ( ! mlt_playlist_get_clip_info( MLT_PLAYLIST( service ), &info, i ) )
                                                {
-                                                       xmlNode *entry = xmlNewChild( child, NULL, "entry", NULL );
-                                                       serialise_service( context, MLT_SERVICE( info.producer ), entry );
+                                                       if ( strcmp( mlt_properties_get( mlt_producer_properties( info.producer ), "mlt_service" ), "blank" ) == 0 )
+                                                       {
+                                                               char length[ 20 ];
+                                                               length[ 19 ] = '\0';
+                                                               xmlNode *entry = xmlNewChild( child, NULL, "blank", NULL );
+                                                               snprintf( length, 19, "%lld", info.frame_count );
+                                                               xmlNewProp( entry, "length", length );
+                                                       }
+                                                       else
+                                                       {
+                                                               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 ) );
+                                                       }
                                                }
                                        }
                                }
+                               else if ( strcmp( (const char*) node->name, "tractor" ) != 0 )
+                               {
+                                       snprintf( key, 10, "%p", service );
+                                       xmlNewProp( node, "producer", mlt_properties_get( context->producer_map, key ) );
+                               }
                        }
                        
                        // Recurse on tractor's producer
                        else if ( strcmp( mlt_properties_get( properties, "resource" ), "<tractor>" ) == 0 )
                        {
-                               child = xmlNewChild( node, NULL, "tractor", NULL );
-
-                               // Set the id
-                               if ( mlt_properties_get( properties, "id" ) == NULL )
+                               if ( context->pass == 0 )
                                {
-                                       snprintf( id, 30, "tractor%d", context->tractor_count++ );
-                                       xmlNewProp( child, "id", id );
+                                       // Recurse on connected producer
+                                       serialise_service( context, mlt_service_get_producer( service ), node );
                                }
+                               else
+                               {
+                                       child = xmlNewChild( node, NULL, "tractor", NULL );
 
-                               // Recurse on connected producer
-                               serialise_service( context, mlt_service_get_producer( service ), child );
-                               
+                                       // Set the id
+                                       if ( mlt_properties_get( properties, "id" ) == NULL )
+                                       {
+                                               snprintf( id, ID_SIZE, "tractor%d", context->tractor_count++ );
+                                               xmlNewProp( child, "id", id );
+                                       }
+                                       
+                                       xmlNewProp( child, "in", mlt_properties_get( properties, "in" ) );
+                                       xmlNewProp( child, "out", mlt_properties_get( properties, "out" ) );
+
+                                       // Recurse on connected producer
+                                       serialise_service( context, mlt_service_get_producer( service ), child );
+                               }
                                break;
                        }
                }
@@ -211,17 +289,19 @@ static void serialise_service( serialise_context context, mlt_service service, x
                        // Recurse on connected producer
                        serialise_service( context, MLT_SERVICE( MLT_FILTER( service )->producer ), node );
 
-                       child = xmlNewChild( node, NULL, "filter", NULL );
-
-                       // Set the id
-                       if ( mlt_properties_get( properties, "id" ) == NULL )
+                       if ( context->pass == 1 )
                        {
-                               snprintf( id, 30, "filter%d", context->filter_count++ );
-                               xmlNewProp( child, "id", id );
-                       }
+                               child = xmlNewChild( node, NULL, "filter", NULL );
 
-                       serialise_properties( properties, child );
+                               // Set the id
+                               if ( mlt_properties_get( properties, "id" ) == NULL )
+                               {
+                                       snprintf( id, ID_SIZE, "filter%d", context->filter_count++ );
+                                       xmlNewProp( child, "id", id );
+                               }
 
+                               serialise_properties( properties, child );
+                       }
                        break;
                }
                
@@ -231,17 +311,19 @@ static void serialise_service( serialise_context context, mlt_service service, x
                        // Recurse on connected producer
                        serialise_service( context, MLT_SERVICE( MLT_TRANSITION( service )->producer ), node );
 
-                       child = xmlNewChild( node, NULL, "transition", NULL );
-                       
-                       // Set the id
-                       if ( mlt_properties_get( properties, "id" ) == NULL )
+                       if ( context->pass == 1 )
                        {
-                               snprintf( id, 30, "transition%d", context->transition_count++ );
-                               xmlNewProp( child, "id", id );
-                       }
-
-                       serialise_properties( properties, child );
+                               child = xmlNewChild( node, NULL, "transition", NULL );
                        
+                               // Set the id
+                               if ( mlt_properties_get( properties, "id" ) == NULL )
+                               {
+                                       snprintf( id, ID_SIZE, "transition%d", context->transition_count++ );
+                                       xmlNewProp( child, "id", id );
+                               }
+
+                               serialise_properties( properties, child );
+                       }
                        break;
                }
                
@@ -261,8 +343,8 @@ static int consumer_start( mlt_consumer this )
        mlt_service service = mlt_service_get_producer( mlt_consumer_service( this ) );
        if ( service != NULL )
        {
-               struct serialise_context_s context;
-               memset( &context, 0, sizeof( struct serialise_context_s ) );
+               struct serialise_context_s *context = calloc( 1, sizeof( struct serialise_context_s ) );
+               context->producer_map = mlt_properties_new();
                
                // Remember inigo
                if ( mlt_properties_get( mlt_service_properties( service ), "mlt_service" ) != NULL &&
@@ -271,11 +353,21 @@ static int consumer_start( mlt_consumer this )
                
                // Ensure producer is a framework producer
                mlt_properties_set( mlt_service_properties( service ), "mlt_type", "mlt_producer" );
-                       
-               serialise_service( &context, service, root );
 
+               // In pass one, we serialise the end producers and playlists,
+               // adding them to a map keyed by address.
+               serialise_service( context, service, root );
+
+               // In pass two, we serialise the tractor and reference the
+               // producers and playlists
+               context->pass++;
+               serialise_service( context, service, root );
+
+               mlt_properties_close( context->producer_map );
+               free( context );
+               
                if ( mlt_properties_get( mlt_consumer_properties( this ), "resource" ) == NULL )
-                       xmlDocFormatDump( stderr, doc, 1 );
+                       xmlDocFormatDump( stdout, doc, 1 );
                else
                        xmlSaveFormatFile( mlt_properties_get( mlt_consumer_properties( this ), "resource" ), doc, 1 );
        }