for ( i = 0; i < mlt_multitrack_count( MLT_MULTITRACK( service ) ); i++ )
{
mlt_producer producer = mlt_producer_cut_parent( mlt_multitrack_track( MLT_MULTITRACK( service ), i ) );
- char *resource_s = mlt_properties_get( mlt_producer_properties( producer ), "resource" );
- if ( resource_s != NULL && !strcmp( resource_s, "<tractor>" ) )
- {
- serialise_tractor( context, MLT_SERVICE( producer ), node );
- context->pass ++;
- serialise_tractor( context, MLT_SERVICE( producer ), node );
- context->pass --;
- }
- else
- {
- serialise_service( context, MLT_SERVICE( producer ), node );
- }
+ serialise_service( context, MLT_SERVICE( producer ), node );
}
}
else
char *id = westley_get_id( context, MLT_SERVICE( parent ), westley_existing );
xmlNewProp( track, "producer", id );
- if ( mlt_properties_get_int( properties, "cut" ) == 1 )
+ if ( mlt_properties_get_int( properties, "_cut" ) == 1 )
{
xmlNewProp( track, "in", mlt_properties_get( properties, "in" ) );
xmlNewProp( track, "out", mlt_properties_get( properties, "out" ) );
mlt_producer producer = mlt_producer_cut_parent( info.producer );
char *service_s = mlt_properties_get( mlt_producer_properties( producer ), "mlt_service" );
char *resource_s = mlt_properties_get( mlt_producer_properties( producer ), "resource" );
- if ( resource_s != NULL && !strcmp( resource_s, "<tractor>" ) )
- {
- serialise_tractor( context, MLT_SERVICE( producer ), node );
- context->pass ++;
- serialise_tractor( context, MLT_SERVICE( producer ), node );
- context->pass --;
- }
- else if ( resource_s != NULL && !strcmp( resource_s, "<playlist>" ) )
+ if ( resource_s != NULL && !strcmp( resource_s, "<playlist>" ) )
serialise_playlist( context, MLT_SERVICE( producer ), node );
else if ( service_s != NULL && strcmp( service_s, "blank" ) != 0 )
serialise_service( context, MLT_SERVICE( producer ), node );
// Tell about the producer
if ( strcmp( mlt_type, "producer" ) == 0 )
{
- serialise_producer( context, service, node );
+ char *mlt_service = mlt_properties_get( properties, "mlt_service" );
+ if ( mlt_properties_get( properties, "westley" ) == NULL && !strcmp( mlt_service, "tractor" ) )
+ {
+ context->pass = 0;
+ serialise_tractor( context, service, node );
+ context->pass = 1;
+ serialise_tractor( context, service, node );
+ context->pass = 0;
+ break;
+ }
+ else
+ {
+ serialise_producer( context, service, node );
+ }
if ( mlt_properties_get( properties, "westley" ) != NULL )
break;
}
// Recurse on tractor's producer
else if ( strcmp( resource, "<tractor>" ) == 0 )
{
+ context->pass = 0;
+ serialise_tractor( context, service, node );
+ context->pass = 1;
serialise_tractor( context, service, node );
+ context->pass = 0;
break;
}
{
xmlDocFormatDump( stdout, doc, 1 );
}
- else if ( !strcmp( resource, "buffer" ) )
+ else if ( strchr( resource, '.' ) == NULL )
{
xmlChar *buffer = NULL;
int length = 0;
xmlDocDumpMemory( doc, &buffer, &length );
- mlt_properties_set_data( properties, "buffer", buffer, length, xmlFree, NULL );
+ mlt_properties_set( properties, resource, buffer );
+ xmlFree( buffer );
}
else
{