X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fwestley%2Fconsumer_westley.c;h=437d9f4c159f3adb8d298f74bd26b1e8c0009721;hb=6405eb05b56e753e9ab7c9ac2c16826d3a0c0ec5;hp=d196ffb9d34c598a7d781b01439667f958d44088;hpb=73345685f05e06c7b2c6a9d2b5c6bcf1c642d82b;p=melted diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c index d196ffb..437d9f4 100644 --- a/src/modules/westley/consumer_westley.c +++ b/src/modules/westley/consumer_westley.c @@ -26,10 +26,13 @@ #include #include +#define ID_SIZE 128 + /** Forward references to static functions. */ 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. @@ -43,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 ); @@ -86,14 +87,17 @@ 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 ) + char *name = mlt_properties_get_name( properties, i ); + if ( name != NULL && + name[ 0 ] != '_' && + mlt_properties_get_value( properties, i ) != NULL && + 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 ) ); } } } @@ -102,9 +106,9 @@ static void serialise_service( serialise_context context, mlt_service service, x { int i; xmlNode *child = node; - char id[ 31 ]; + char id[ ID_SIZE + 1 ]; char key[ 11 ]; - id[ 30 ] = '\0'; + id[ ID_SIZE ] = '\0'; key[ 10 ] = '\0'; // Iterate over consumer/producer connections @@ -123,9 +127,11 @@ static void serialise_service( serialise_context context, mlt_service service, x // Set the id if ( mlt_properties_get( properties, "id" ) == NULL ) { - snprintf( id, 30, "producer%d", context->producer_count++ ); + 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 ); // Add producer to the map @@ -137,6 +143,8 @@ static void serialise_service( serialise_context context, mlt_service service, x snprintf( key, 10, "%p", service ); xmlNewProp( node, "producer", mlt_properties_get( context->producer_map, key ) ); } + if ( mlt_properties_get( properties, "westley" ) != NULL ) + break; } // Tell about the framework container producers @@ -166,7 +174,7 @@ static void serialise_service( serialise_context context, mlt_service service, x // Set the id if ( mlt_properties_get( properties, "id" ) == NULL ) { - snprintf( id, 30, "multitrack%d", context->multitrack_count++ ); + snprintf( id, ID_SIZE, "multitrack%d", context->multitrack_count++ ); xmlNewProp( child, "id", id ); } @@ -205,12 +213,11 @@ static void serialise_service( serialise_context context, mlt_service service, x // Set the id if ( mlt_properties_get( properties, "id" ) == NULL ) { - snprintf( id, 30, "playlist%d", context->playlist_count++ ); + snprintf( id, ID_SIZE, "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" ) ); + else + strncpy( id, mlt_properties_get( properties, "id" ), ID_SIZE ); // Add producer to the map snprintf( key, 10, "%p", service ); @@ -234,11 +241,13 @@ 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" ) ); } } } } - else + else if ( strcmp( (const char*) node->name, "tractor" ) != 0 ) { snprintf( key, 10, "%p", service ); xmlNewProp( node, "producer", mlt_properties_get( context->producer_map, key ) ); @@ -260,9 +269,12 @@ static void serialise_service( serialise_context context, mlt_service service, x // Set the id if ( mlt_properties_get( properties, "id" ) == NULL ) { - snprintf( id, 30, "tractor%d", context->tractor_count++ ); + 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 ); @@ -284,8 +296,10 @@ static void serialise_service( serialise_context context, mlt_service service, x // Set the id if ( mlt_properties_get( properties, "id" ) == NULL ) { - snprintf( id, 30, "filter%d", context->filter_count++ ); + 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 ); @@ -306,8 +320,10 @@ static void serialise_service( serialise_context context, mlt_service service, x // Set the id if ( mlt_properties_get( properties, "id" ) == NULL ) { - snprintf( id, 30, "transition%d", context->transition_count++ ); + 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 ); @@ -355,7 +371,7 @@ static int consumer_start( mlt_consumer this ) 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 ); } @@ -363,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; +} +