fezzik gets a rhyming dictionary

[mlt] / src / framework / mlt_properties.c

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index cebaa900d144677dd4adf9b5f9e5f90b83545118..d4d14cf48bba69fa2f6ac6faa8bb4627871452a5 100644 (file)
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -38,6 +38,7 @@ typedef struct
        mlt_property *value;
        int count;
        int size;
+       mlt_properties mirror;
 }
 property_list;
 
@@ -73,6 +74,45 @@ mlt_properties mlt_properties_new( )
        return this;
 }
 
+/** Load properties from a file.
+*/
+
+mlt_properties mlt_properties_load( char *filename )
+{
+       // Construct a standalone properties object
+       mlt_properties this = mlt_properties_new( );
+
+       if ( this != NULL )
+       {
+               // Open the file
+               FILE *file = fopen( filename, "r" );
+
+               // Load contents of file
+               if ( file != NULL )
+               {
+                       // Temp string
+                       char temp[ 1024 ];
+
+                       // Read each string from the file
+                       while( fgets( temp, 1024, file ) )
+                       {
+                               // Chomp the string
+                               temp[ strlen( temp ) - 1 ] = '\0';
+
+                               // Parse and set the property
+                               if ( strcmp( temp, "" ) )
+                                       mlt_properties_parse( this, temp );
+                       }
+
+                       // Close the file
+                       fclose( file );
+               }
+       }
+
+       // Return the pointer
+       return this;
+}
+
 static inline int generate_hash( char *name )
 {
        int hash = 0;
@@ -87,17 +127,14 @@ static inline int generate_hash( char *name )
        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 )
 {
-       if ( strcmp( name, "in" ) && strcmp( name, "out" ) )
+       property_list *list = this->private;
+       if ( list->mirror != NULL ) 
        {
-               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 );
-               }
+               char *value = mlt_properties_get( this, name );
+               if ( value != NULL )
+                       mlt_properties_set( list->mirror, name, value );
        }
 }
 
@@ -106,7 +143,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.
@@ -156,20 +194,23 @@ static inline mlt_property mlt_properties_find( mlt_properties this, char *name
 {
        property_list *list = this->private;
        mlt_property value = NULL;
-       int i = 0;
        int key = generate_hash( name );
+       int i = list->hash[ key ] - 1;
 
-       // Check if we're hashed
-       if ( list->count > 0 &&
-                name[ 0 ] == list->name[ list->hash[ key ] ][ 0 ] && 
-                !strcmp( list->name[ list->hash[ key ] ], name ) )
-               value = list->value[ list->hash[ key ] ];
-
-       // Locate the item 
-       for ( i = 0; value == NULL && i < list->count; i ++ )
-               if ( name[ 0 ] == list->name[ i ][ 0 ] && !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;
 }
 
@@ -194,7 +235,8 @@ static mlt_property mlt_properties_add( mlt_properties this, char *name )
        list->value[ list->count ] = mlt_property_init( );
 
        // Assign to hash table
-       list->hash[ key ] = list->count;
+       if ( list->hash[ key ] == 0 )
+               list->hash[ key ] = list->count + 1;
 
        // Return and increment count accordingly
        return list->value[ list->count ++ ];
@@ -236,6 +278,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.
 */
 
@@ -453,6 +503,7 @@ int mlt_properties_rename( mlt_properties this, char *source, char *dest )
                        {
                                free( list->name[ i ] );
                                list->name[ i ] = strdup( dest );
+                               list->hash[ generate_hash( dest ) ] = i + 1;
                                break;
                        }
                }