X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=1d13714634b051a3e815981dd76650378de08452;hb=221df9e782ee929442488b75827341e111cd4254;hp=cebaa900d144677dd4adf9b5f9e5f90b83545118;hpb=12d4027b3039f13c4b5f9fdb12f2fb4b7d3c3f44;p=melted

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index cebaa90..1d13714 100644
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 /* ---------------- // Private Implementation // ---------------- */
 
@@ -38,24 +39,48 @@ typedef struct
 	mlt_property *value;
 	int count;
 	int size;
+	mlt_properties mirror;
+	int ref_count;
 }
 property_list;
 
+/** Memory leak checks.
+*/
+
+//#define _MLT_PROPERTY_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 local structure
+		this->local = calloc( sizeof( property_list ), 1 );
 
-	// Allocate the private structure
-	this->private = calloc( sizeof( property_list ), 1 );
+		// Increment the ref count
+		( ( property_list * )this->local )->ref_count = 1;
+	}
 
-	return this->private == NULL;
+	// Check that initialisation was successful
+	return this != NULL && this->local == NULL;
 }
 
 /** Constructor for stand alone object.
@@ -73,6 +98,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, "" ) && 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;
@@ -87,18 +151,41 @@ 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->local;
+	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 );
+	}
+}
+
+/** Maintain ref count to allow multiple uses of an mlt object.
+*/
+
+int mlt_properties_inc_ref( mlt_properties this )
+{
+	if ( this != NULL )
+	{
+		property_list *list = this->local;
+		return ++ list->ref_count;
+	}
+	return 0;
+}
+
+/** Maintain ref count to allow multiple uses of an mlt object.
+*/
+
+int mlt_properties_dec_ref( mlt_properties this )
+{
+	if ( this != NULL )
+	{
+		property_list *list = this->local;
+		return -- list->ref_count;
 	}
+	return 0;
 }
 
 /** Allow the specification of a mirror.
@@ -106,7 +193,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->local;
+	list->mirror = that;
 }
 
 /** Inherit all serialisable properties from that into this.
@@ -154,22 +242,25 @@ int mlt_properties_pass( mlt_properties this, mlt_properties that, char *prefix
 
 static inline mlt_property mlt_properties_find( mlt_properties this, char *name )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	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;
 }
 
@@ -178,7 +269,7 @@ static inline 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;
+	property_list *list = this->local;
 	int key = generate_hash( name );
 
 	// Check that we have space and resize if necessary
@@ -194,7 +285,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 ++ ];
@@ -227,15 +319,73 @@ int mlt_properties_set( mlt_properties this, char *name, char *value )
 	mlt_property property = mlt_properties_fetch( this, name );
 
 	// Set it if not NULL
-	if ( property != NULL )
+	if ( property != NULL && ( value == NULL || value[ 0 ] != '@' ) )
 	{
 		error = mlt_property_set_string( property, value );
 		mlt_properties_do_mirror( this, name );
 	}
+	else if ( property != NULL && value[ 0 ] == '@' )
+	{
+		int total = 0;
+		int current = 0;
+		char id[ 255 ];
+		char op = '+';
+
+		value ++;
+
+		while ( *value != '\0' )
+		{
+			int length = strcspn( value, "+-*/" );
+
+			// Get the identifier
+			strncpy( id, value, length );
+			id[ length ] = '\0';
+			value += length;
+
+			// Determine the value
+			if ( isdigit( id[ 0 ] ) )
+				current = atof( id );
+			else
+				current = mlt_properties_get_int( this, id );
+
+			// Apply the operation
+			switch( op )
+			{
+				case '+':
+					total += current;
+					break;
+				case '-':
+					total -= current;
+					break;
+				case '*':
+					total *= current;
+					break;
+				case '/':
+					total /= current;
+					break;
+			}
+
+			// Get the next op
+			op = *value != '\0' ? *value ++ : ' ';
+		}
+
+		error = mlt_property_set_int( property, total );
+		mlt_properties_do_mirror( this, name );
+	}
+
+	mlt_events_fire( this, "property-changed", name, NULL );
 
 	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.
 */
 
@@ -250,7 +400,7 @@ char *mlt_properties_get( mlt_properties this, char *name )
 
 char *mlt_properties_get_name( mlt_properties this, int index )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	if ( index >= 0 && index < list->count )
 		return list->name[ index ];
 	return NULL;
@@ -261,7 +411,7 @@ char *mlt_properties_get_name( mlt_properties this, int index )
 
 char *mlt_properties_get_value( mlt_properties this, int index )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	if ( index >= 0 && index < list->count )
 		return mlt_property_get_string( list->value[ index ] );
 	return NULL;
@@ -272,7 +422,7 @@ char *mlt_properties_get_value( mlt_properties this, int index )
 
 void *mlt_properties_get_data_at( mlt_properties this, int index, int *size )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	if ( index >= 0 && index < list->count )
 		return mlt_property_get_data( list->value[ index ], size );
 	return NULL;
@@ -283,7 +433,7 @@ void *mlt_properties_get_data_at( mlt_properties this, int index, int *size )
 
 int mlt_properties_count( mlt_properties this )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	return list->count;
 }
 
@@ -293,24 +443,29 @@ int mlt_properties_count( mlt_properties this )
 int mlt_properties_parse( mlt_properties this, char *namevalue )
 {
 	char *name = strdup( namevalue );
-	char *value = strdup( namevalue );
+	char *value = NULL;
 	int error = 0;
+	char *ptr = strchr( name, '=' );
 
-	if ( strchr( name, '=' ) )
+	if ( ptr )
 	{
-		*( strchr( name, '=' ) ) = '\0';
-		strcpy( value, strchr( value, '=' ) + 1 );
+		*( ptr ++ ) = '\0';
+
+		if ( *ptr != '\"' )
+		{
+			value = strdup( ptr );
+		}
+		else
+		{
+			ptr ++;
+			value = strdup( ptr );
+			if ( value != NULL && value[ strlen( value ) - 1 ] == '\"' )
+				value[ strlen( value ) - 1 ] = '\0';
+		}
 	}
 	else
 	{
-		strcpy( value, "" );
-	}
-
-	if ( strlen( value ) > 1 && value[ 0 ] == '\"' )
-	{
-		strcpy( value, value + 1 );
-		if ( value[ strlen( value ) - 1 ] == '\"' )
-			value[ strlen( value ) - 1 ] = '\0';
+		value = strdup( "" );
 	}
 
 	error = mlt_properties_set( this, name, value );
@@ -347,6 +502,8 @@ int mlt_properties_set_int( mlt_properties this, char *name, int value )
 		mlt_properties_do_mirror( this, name );
 	}
 
+	mlt_events_fire( this, "property-changed", name, NULL );
+
 	return error;
 }
 
@@ -376,6 +533,8 @@ int mlt_properties_set_double( mlt_properties this, char *name, double value )
 		mlt_properties_do_mirror( this, name );
 	}
 
+	mlt_events_fire( this, "property-changed", name, NULL );
+
 	return error;
 }
 
@@ -405,6 +564,8 @@ int mlt_properties_set_position( mlt_properties this, char *name, mlt_position v
 		mlt_properties_do_mirror( this, name );
 	}
 
+	mlt_events_fire( this, "property-changed", name, NULL );
+
 	return error;
 }
 
@@ -431,6 +592,8 @@ int mlt_properties_set_data( mlt_properties this, char *name, void *value, int l
 	if ( property != NULL )
 		error = mlt_property_set_data( property, value, length, destroy, serialise );
 
+	mlt_events_fire( this, "property-changed", name, NULL );
+
 	return error;
 }
 
@@ -443,7 +606,7 @@ int mlt_properties_rename( mlt_properties this, char *source, char *dest )
 
 	if ( value == NULL )
 	{
-		property_list *list = this->private;
+		property_list *list = this->local;
 		int i = 0;
 
 		// Locate the item 
@@ -453,6 +616,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;
 			}
 		}
@@ -466,10 +630,27 @@ int mlt_properties_rename( mlt_properties this, char *source, char *dest )
 
 void mlt_properties_dump( mlt_properties this, FILE *output )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	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 ] ) );
+}
+
+void mlt_properties_debug( mlt_properties this, char *title, FILE *output )
+{
+	fprintf( stderr, "%s: ", title );
+	if ( this != NULL )
+	{
+		property_list *list = this->local;
+		int i = 0;
+		fprintf( output, "[ ref=%d", list->ref_count );
+		for ( i = 0; i < list->count; i ++ )
+			if ( mlt_properties_get( this, list->name[ i ] ) != NULL )
+				fprintf( output, ", %s=%s", list->name[ i ], mlt_properties_get( this, list->name[ i ] ) );
+		fprintf( output, " ]" );
+	}
+	fprintf( stderr, "\n" );
 }
 
 /** Close the list.
@@ -477,23 +658,44 @@ 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 && mlt_properties_dec_ref( this ) <= 0 )
 	{
-		free( list->name[ index ] );
-		mlt_property_close( list->value[ index ] );
-	}
+		if ( this->close != NULL )
+		{
+			this->close( this->close_object );
+		}
+		else
+		{
+			property_list *list = this->local;
+			int index = 0;
 
-	// Clear up the list
-	free( list->name );
-	free( list->value );
-	free( list );
+#ifdef _MLT_PROPERTY_CHECKS_
+			// Show debug info
+			mlt_properties_debug( this, "Closing", stderr );
 
-	// Free this now if this has no child
-	if ( this->child == NULL )
-		free( this );
+			// 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
+
+			// 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 );
+	
+			// Free this now if this has no child
+			if ( this->child == NULL )
+				free( this );
+		}
+	}
 }