X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=2824ccaec9435472550edea5d1d992fe1916c0ab;hb=9ab18ed63c37a9ef65e06697ae25f5c198d788bb;hp=233e8aced35de29e58700d0ecf6cf9301f7e00f5;hpb=661165812e3410fe2f6f49d7af882b36a0efcf82;p=melted diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c index 233e8ac..2824cca 100644 --- a/src/framework/mlt_properties.c +++ b/src/framework/mlt_properties.c @@ -33,6 +33,7 @@ typedef struct { + int hash[ 199 ]; char **name; mlt_property *value; int count; @@ -57,18 +58,116 @@ int mlt_properties_init( mlt_properties this, void *child ) return this->private == NULL; } +/** Constructor for stand alone object. +*/ + +mlt_properties mlt_properties_new( ) +{ + // Construct a standalone properties object + mlt_properties this = calloc( sizeof( struct mlt_properties_s ), 1 ); + + // Initialise this + mlt_properties_init( this, NULL ); + + // Return the pointer + 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 ) +{ + 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 ); + int i = 0; + for ( i = 0; i < count; i ++ ) + { + char *value = mlt_properties_get_value( that, i ); + if ( value != NULL ) + { + 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 ]; + + // 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 = 0; value == NULL && i < list->count; i ++ ) - if ( !strcmp( list->name[ i ], name ) ) + if ( name[ 0 ] == list->name[ i ][ 0 ] && !strcmp( list->name[ i ], name ) ) value = list->value[ i ]; return value; @@ -80,11 +179,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 ) ); } @@ -93,6 +193,9 @@ 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 + list->hash[ key ] = list->count; + // Return and increment count accordingly return list->value[ list->count ++ ]; } @@ -125,7 +228,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; } @@ -161,6 +267,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. */ @@ -189,6 +306,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 ); @@ -218,7 +342,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; } @@ -244,7 +371,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; } @@ -252,16 +382,16 @@ int mlt_properties_set_double( mlt_properties this, char *name, double value ) /** Get a value associated to the name. */ -mlt_timecode mlt_properties_get_timecode( mlt_properties this, char *name ) +mlt_position mlt_properties_get_position( mlt_properties this, char *name ) { mlt_property value = mlt_properties_find( this, name ); - return value == NULL ? 0 : mlt_property_get_timecode( value ); + return value == NULL ? 0 : mlt_property_get_position( value ); } /** Set a value associated to the name. */ -int mlt_properties_set_timecode( mlt_properties this, char *name, mlt_timecode value ) +int mlt_properties_set_position( mlt_properties this, char *name, mlt_position value ) { int error = 1; @@ -270,7 +400,10 @@ int mlt_properties_set_timecode( mlt_properties this, char *name, mlt_timecode v // Set it if not NULL if ( property != NULL ) - error = mlt_property_set_timecode( property, value ); + { + error = mlt_property_set_position( property, value ); + mlt_properties_do_mirror( this, name ); + } return error; } @@ -301,6 +434,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. */ @@ -310,7 +481,7 @@ void mlt_properties_close( mlt_properties this ) int index = 0; // Clean up names and values - for ( index = 0; index < list->count; index ++ ) + for ( index = list->count - 1; index >= 0; index -- ) { free( list->name[ index ] ); mlt_property_close( list->value[ index ] ); @@ -320,5 +491,9 @@ void mlt_properties_close( mlt_properties this ) free( list->name ); free( list->value ); free( list ); + + // Free this now if this has no child + if ( this->child == NULL ) + free( this ); }