X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=a774ca1d06727cfc5640d394f14fc6cf3b543547;hb=00db7ed91dfa61f9e144b6d5548350a5954deb61;hp=d047da0c2ae503d23fd2c32d64695ca5e3e6717b;hpb=7c518e80321a87a22d2e48835442c9f5b70dcd17;p=melted diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c index d047da0..a774ca1 100644 --- a/src/framework/mlt_properties.c +++ b/src/framework/mlt_properties.c @@ -72,24 +72,73 @@ mlt_properties mlt_properties_new( ) return this; } +/** Special case - when a container (such as fezzik) is protecting another + producer, we need to ensure that properties are passed through to the + real producer. +*/ + +static void mlt_properties_do_mirror( mlt_properties this, char *name ) +{ + if ( strcmp( name, "in" ) && strcmp( name, "out" ) ) + { + mlt_properties mirror = mlt_properties_get_data( this, "mlt_mirror", NULL ); + if ( mirror != NULL ) + { + char *value = mlt_properties_get( this, name ); + if ( value != NULL ) + mlt_properties_set( mirror, name, value ); + } + } +} + +/** Allow the specification of a mirror. +*/ + +void mlt_properties_mirror( mlt_properties this, mlt_properties that ) +{ + mlt_properties_set_data( this, "mlt_mirror", that, 0, NULL, NULL ); +} + /** Inherit all serialisable properties from that into this. */ int mlt_properties_inherit( mlt_properties this, mlt_properties that ) { int count = mlt_properties_count( that ); - while ( count -- ) + int i = 0; + for ( i = 0; i < count; i ++ ) { - char *value = mlt_properties_get_value( that, count ); + char *value = mlt_properties_get_value( that, i ); if ( value != NULL ) { - char *name = mlt_properties_get_name( that, count ); + char *name = mlt_properties_get_name( that, i ); mlt_properties_set( this, name, value ); } } return 0; } +/** Pass all properties from 'that' that match the prefix to 'this' (excluding the prefix). +*/ + +int mlt_properties_pass( mlt_properties this, mlt_properties that, char *prefix ) +{ + int count = mlt_properties_count( that ); + int length = strlen( prefix ); + int i = 0; + for ( i = 0; i < count; i ++ ) + { + char *name = mlt_properties_get_name( that, i ); + if ( !strncmp( name, prefix, length ) ) + { + char *value = mlt_properties_get_value( that, i ); + if ( value != NULL ) + mlt_properties_set( this, name + length, value ); + } + } + return 0; +} + /** Locate a property by name */ @@ -117,7 +166,7 @@ static mlt_property mlt_properties_add( mlt_properties this, char *name ) // Check that we have space and resize if necessary if ( list->count == list->size ) { - list->size += 10; + list->size += 50; list->name = realloc( list->name, list->size * sizeof( char * ) ); list->value = realloc( list->value, list->size * sizeof( mlt_property ) ); } @@ -158,7 +207,10 @@ int mlt_properties_set( mlt_properties this, char *name, char *value ) // Set it if not NULL if ( property != NULL ) + { error = mlt_property_set_string( property, value ); + mlt_properties_do_mirror( this, name ); + } return error; } @@ -194,6 +246,17 @@ char *mlt_properties_get_value( mlt_properties this, int index ) return NULL; } +/** Get a data value by index. +*/ + +void *mlt_properties_get_data_at( mlt_properties this, int index, int *size ) +{ + property_list *list = this->private; + if ( index >= 0 && index < list->count ) + return mlt_property_get_data( list->value[ index ], size ); + return NULL; +} + /** Return the number of items in the list. */ @@ -222,6 +285,13 @@ int mlt_properties_parse( mlt_properties this, char *namevalue ) strcpy( value, "" ); } + if ( strlen( value ) > 1 && value[ 0 ] == '\"' ) + { + strcpy( value, value + 1 ); + if ( value[ strlen( value ) - 1 ] == '\"' ) + value[ strlen( value ) - 1 ] = '\0'; + } + error = mlt_properties_set( this, name, value ); free( name ); @@ -251,7 +321,10 @@ int mlt_properties_set_int( mlt_properties this, char *name, int value ) // Set it if not NULL if ( property != NULL ) + { error = mlt_property_set_int( property, value ); + mlt_properties_do_mirror( this, name ); + } return error; } @@ -277,7 +350,10 @@ int mlt_properties_set_double( mlt_properties this, char *name, double value ) // Set it if not NULL if ( property != NULL ) + { error = mlt_property_set_double( property, value ); + mlt_properties_do_mirror( this, name ); + } return error; } @@ -303,7 +379,10 @@ int mlt_properties_set_position( mlt_properties this, char *name, mlt_position v // Set it if not NULL if ( property != NULL ) + { error = mlt_property_set_position( property, value ); + mlt_properties_do_mirror( this, name ); + } return error; } @@ -334,6 +413,44 @@ int mlt_properties_set_data( mlt_properties this, char *name, void *value, int l return error; } +/** Rename a property. +*/ + +int mlt_properties_rename( mlt_properties this, char *source, char *dest ) +{ + mlt_property value = mlt_properties_find( this, dest ); + + if ( value == NULL ) + { + property_list *list = this->private; + int i = 0; + + // Locate the item + for ( i = 0; i < list->count; i ++ ) + { + if ( !strcmp( list->name[ i ], source ) ) + { + free( list->name[ i ] ); + list->name[ i ] = strdup( dest ); + break; + } + } + } + + return value != NULL; +} + +/** Dump the properties. +*/ + +void mlt_properties_dump( mlt_properties this, FILE *output ) +{ + property_list *list = this->private; + int i = 0; + for ( i = 0; i < list->count; i ++ ) + fprintf( stderr, "%s = %s\n", list->name[ i ], mlt_properties_get( this, list->name[ i ] ) ); +} + /** Close the list. */ @@ -342,13 +459,9 @@ void mlt_properties_close( mlt_properties this ) property_list *list = this->private; int index = 0; - int debug = mlt_properties_get_int( this, "debug" ); - // Clean up names and values - for ( index = 0; index < list->count; index ++ ) + for ( index = list->count - 1; index >= 0; index -- ) { - if ( debug ) - fprintf( stderr, "closing %s\n", list->name[ index ] ); free( list->name[ index ] ); mlt_property_close( list->value[ index ] ); }