X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=4b0f76bb91e68027ebd1716256b1dd9f1089c740;hb=25f69a94909b67a20d84bc0503c954d0a491ca36;hp=e1e6453968bec63d35eab80b139410897fd62efa;hpb=0f6ab868f4253de21c81a9ba5a83efa598974ced;p=melted

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index e1e6453..4b0f76b 100644
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -33,28 +33,47 @@
 
 typedef struct
 {
+	int hash[ 199 ];
 	char **name;
 	mlt_property *value;
 	int count;
 	int size;
+	mlt_properties mirror;
 }
 property_list;
 
+/** Memory leak checks.
+*/
+
+#ifdef _MLT_PROPERTY_CHECKS_
+static int properties_created = 0;
+static int properties_destroyed = 0;
+#endif
+
 /** Basic implementation.
 */
 
 int mlt_properties_init( mlt_properties this, void *child )
 {
-	// NULL all methods
-	memset( this, 0, sizeof( struct mlt_properties_s ) );
+	if ( this != NULL )
+	{
+#ifdef _MLT_PROPERTY_CHECKS_
+		// Increment number of properties created
+		properties_created ++;
+#endif
+
+		// NULL all methods
+		memset( this, 0, sizeof( struct mlt_properties_s ) );
 
-	// Assign the child of the object
-	this->child = child;
+		// Assign the child of the object
+		this->child = child;
 
-	// Allocate the private structure
-	this->private = calloc( sizeof( property_list ), 1 );
+		// Allocate the private structure
+		this->private = calloc( sizeof( property_list ), 1 );
+	}
 
-	return this->private == NULL;
+	// Check that initialisation was successful
+	return this != NULL && this->private == NULL;
 }
 
 /** Constructor for stand alone object.
@@ -72,22 +91,67 @@ 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, "" ) && temp[ 0 ] != '#' )
+					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;
+	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 )
 {
-	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 );
 	}
 }
 
@@ -96,7 +160,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.
@@ -105,32 +170,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;
 }
 
@@ -140,11 +237,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 ) );
 	}
@@ -153,6 +251,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 ++ ];
 }
@@ -193,6 +295,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.
 */
 
@@ -224,6 +334,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.
 */
 
@@ -252,6 +373,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 );
@@ -392,6 +520,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;
 			}
 		}
@@ -408,7 +537,8 @@ 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 ] ) );
+		if ( mlt_properties_get( this, list->name[ i ] ) != NULL )
+			fprintf( output, "%s=%s\n", list->name[ i ], mlt_properties_get( this, list->name[ i ] ) );
 }
 
 /** Close the list.
@@ -416,23 +546,34 @@ void mlt_properties_dump( mlt_properties this, FILE *output )
 
 void mlt_properties_close( mlt_properties this )
 {
-	property_list *list = this->private;
-	int index = 0;
-
-	// Clean up names and values
-	for ( index = list->count - 1; index >= 0; index -- )
+	if ( this != NULL )
 	{
-		free( list->name[ index ] );
-		mlt_property_close( list->value[ index ] );
-	}
+		property_list *list = this->private;
+		int index = 0;
+
+		// Clean up names and values
+		for ( index = list->count - 1; index >= 0; index -- )
+		{
+			free( list->name[ index ] );
+			mlt_property_close( list->value[ index ] );
+		}
+
+		// Clear up the list
+		free( list->name );
+		free( list->value );
+		free( list );
 
-	// Clear up the list
-	free( list->name );
-	free( list->value );
-	free( list );
+		// Free this now if this has no child
+		if ( this->child == NULL )
+			free( this );
 
-	// Free this now if this has no child
-	if ( this->child == NULL )
-		free( this );
+#ifdef _MLT_PROPERTY_CHECKS_
+		// Increment destroyed count
+		properties_destroyed ++;
+
+		// Show current stats - these should match when the app is closed
+		fprintf( stderr, "Created %d, destroyed %d\n", properties_created, properties_destroyed );
+#endif
+	}
 }