X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=1638200c0a85bce147359fd649206f64452147c7;hb=5b59ce704d4f317e845afa30c5ade12c0fd22d43;hp=27f4a27b6e41c3b43b0b25c3f43dd7db88a4eb32;hpb=36aad7b318537612374acfd3f626a8c1364ad95d;p=melted diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c index 27f4a27..1638200 100644 --- a/src/framework/mlt_properties.c +++ b/src/framework/mlt_properties.c @@ -33,10 +33,12 @@ typedef struct { + int hash[ 199 ]; char **name; mlt_property *value; int count; int size; + mlt_properties mirror; } property_list; @@ -72,19 +74,28 @@ mlt_properties mlt_properties_new( ) return this; } +static inline int generate_hash( char *name ) +{ + int hash = 0; + int i = 1; + while ( *name ) + hash = ( hash + ( i ++ * ( *name ++ & 31 ) ) ) % 199; + return hash; +} + /** 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 ) +static inline void mlt_properties_do_mirror( mlt_properties this, char *name ) { - mlt_properties mirror = mlt_properties_get_data( this, "mlt_mirror", NULL ); - if ( mirror != NULL ) + property_list *list = this->private; + if ( list->mirror != NULL ) { char *value = mlt_properties_get( this, name ); if ( value != NULL ) - mlt_properties_set( mirror, name, value ); + mlt_properties_set( list->mirror, name, value ); } } @@ -93,7 +104,8 @@ static void mlt_properties_do_mirror( mlt_properties this, char *name ) void mlt_properties_mirror( mlt_properties this, mlt_properties that ) { - mlt_properties_set_data( this, "mlt_mirror", that, 0, NULL, NULL ); + property_list *list = this->private; + list->mirror = that; } /** Inherit all serialisable properties from that into this. @@ -102,32 +114,64 @@ void mlt_properties_mirror( mlt_properties this, mlt_properties that ) 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 */ -static mlt_property mlt_properties_find( mlt_properties this, char *name ) +static inline mlt_property mlt_properties_find( mlt_properties this, char *name ) { - mlt_property value = NULL; property_list *list = this->private; - int i = 0; + mlt_property value = NULL; + int key = generate_hash( name ); + int i = list->hash[ key ] - 1; - // Locate the item - for ( i = 0; value == NULL && i < list->count; i ++ ) - if ( !strcmp( list->name[ i ], name ) ) + if ( i >= 0 ) + { + // Check if we're hashed + if ( list->count > 0 && + name[ 0 ] == list->name[ i ][ 0 ] && + !strcmp( list->name[ i ], name ) ) value = list->value[ i ]; + // Locate the item + for ( i = list->count - 1; value == NULL && i >= 0; i -- ) + if ( name[ 0 ] == list->name[ i ][ 0 ] && !strcmp( list->name[ i ], name ) ) + value = list->value[ i ]; + } + return value; } @@ -137,11 +181,12 @@ static mlt_property mlt_properties_find( mlt_properties this, char *name ) static mlt_property mlt_properties_add( mlt_properties this, char *name ) { property_list *list = this->private; + int key = generate_hash( 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 ) ); } @@ -150,6 +195,10 @@ static mlt_property mlt_properties_add( mlt_properties this, char *name ) list->name[ list->count ] = strdup( name ); list->value[ list->count ] = mlt_property_init( ); + // Assign to hash table + if ( list->hash[ key ] == 0 ) + list->hash[ key ] = list->count + 1; + // Return and increment count accordingly return list->value[ list->count ++ ]; } @@ -190,6 +239,14 @@ int mlt_properties_set( mlt_properties this, char *name, char *value ) return error; } +/** Set or default the property. +*/ + +int mlt_properties_set_or_default( mlt_properties this, char *name, char *value, char *def ) +{ + return mlt_properties_set( this, name, value == NULL ? def : value ); +} + /** Get a string value by name. */ @@ -221,6 +278,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. */ @@ -249,6 +317,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 ); @@ -370,6 +445,45 @@ 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 ); + list->hash[ generate_hash( dest ) ] = i + 1; + 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. */