consumer_westley now only puts in/out as element attributes and not property elements

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

diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c
index be075e8..437d9f4 100644 (file)
--- a/src/modules/westley/consumer_westley.c
+++ b/src/modules/westley/consumer_westley.c
@@ -32,6 +32,7 @@
 */
 
 static int consumer_start( mlt_consumer parent );
+static int consumer_is_stopped( mlt_consumer this );
 
 /** This is what will be called by the factory - anything can be passed in
        via the argument, but keep it simple.
@@ -45,11 +46,9 @@ 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;
 
                mlt_properties_set( mlt_consumer_properties( this ), "resource", arg );
 
@@ -92,14 +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 0
-                       p = xmlNewChild( node, NULL, "prop", NULL );
-#else
-                       p = node;
-#endif
-                       xmlNewProp( p, mlt_properties_get_name( properties, i ), mlt_properties_get_value( properties, i ) );
+                       p = xmlNewChild( node, NULL, "property", NULL );
+                       xmlNewProp( p, "name", mlt_properties_get_name( properties, i ) );
+                       xmlNodeSetContent( p, mlt_properties_get_value( properties, i ) );
                }
        }
 }
@@ -221,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 );
@@ -246,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" ) );
                                                        }
                                                }
                                        }
@@ -301,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 );
@@ -323,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 );
@@ -378,10 +379,11 @@ static int consumer_start( mlt_consumer this )
        xmlFreeDoc( doc );
        mlt_consumer_stop( this );
 
-       // Tell inigo, enough already!
-       if ( inigo != NULL )
-               mlt_properties_set_int( mlt_service_properties( inigo ), "done", 1 );
-       
        return 0;
 }
 
+static int consumer_is_stopped( mlt_consumer this )
+{
+       return 1;
+}
+