X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=b42d02a4c90cd44f22dec0dea7eaf0d8088d9a25;hb=df833610f58161f108b0c1f98c1e3705731e42ff;hp=899bf9ad60516ca2fe9c822dd732d508659ccc77;hpb=2c0cf75e5da5906e48c5a6398bd48d04501283b9;p=melted

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index 899bf9a..b42d02a 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 // ---------------- */
 
@@ -39,12 +40,15 @@ typedef struct
 	int count;
 	int size;
 	mlt_properties mirror;
+	int ref_count;
 }
 property_list;
 
 /** Memory leak checks.
 */
 
+//#define _MLT_PROPERTY_CHECKS_ 2
+
 #ifdef _MLT_PROPERTY_CHECKS_
 static int properties_created = 0;
 static int properties_destroyed = 0;
@@ -68,12 +72,15 @@ int mlt_properties_init( mlt_properties this, void *child )
 		// Assign the child of the object
 		this->child = child;
 
-		// Allocate the private structure
-		this->private = calloc( sizeof( property_list ), 1 );
+		// Allocate the local structure
+		this->local = calloc( sizeof( property_list ), 1 );
+
+		// Increment the ref count
+		( ( property_list * )this->local )->ref_count = 1;
 	}
 
 	// Check that initialisation was successful
-	return this != NULL && this->private == NULL;
+	return this != NULL && this->local == NULL;
 }
 
 /** Constructor for stand alone object.
@@ -94,7 +101,7 @@ mlt_properties mlt_properties_new( )
 /** Load properties from a file.
 */
 
-mlt_properties mlt_properties_load( char *filename )
+mlt_properties mlt_properties_load( const char *filename )
 {
 	// Construct a standalone properties object
 	mlt_properties this = mlt_properties_new( );
@@ -109,6 +116,7 @@ mlt_properties mlt_properties_load( char *filename )
 		{
 			// Temp string
 			char temp[ 1024 ];
+			char last[ 1024 ] = "";
 
 			// Read each string from the file
 			while( fgets( temp, 1024, file ) )
@@ -116,6 +124,19 @@ mlt_properties mlt_properties_load( char *filename )
 				// Chomp the string
 				temp[ strlen( temp ) - 1 ] = '\0';
 
+				// Check if the line starts with a .
+				if ( temp[ 0 ] == '.' )
+				{
+					char temp2[ 1024 ];
+					sprintf( temp2, "%s%s", last, temp );
+					strcpy( temp, temp2 );
+				}
+				else if ( strchr( temp, '=' ) )
+				{
+					strcpy( last, temp );
+					*( strchr( last, '=' ) ) = '\0';
+				}
+
 				// Parse and set the property
 				if ( strcmp( temp, "" ) && temp[ 0 ] != '#' )
 					mlt_properties_parse( this, temp );
@@ -130,7 +151,7 @@ mlt_properties mlt_properties_load( char *filename )
 	return this;
 }
 
-static inline int generate_hash( char *name )
+static inline int generate_hash( const char *name )
 {
 	int hash = 0;
 	int i = 1;
@@ -144,9 +165,9 @@ static inline int generate_hash( char *name )
 	real producer.
 */
 
-static inline void mlt_properties_do_mirror( mlt_properties this, char *name )
+static inline void mlt_properties_do_mirror( mlt_properties this, const char *name )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	if ( list->mirror != NULL ) 
 	{
 		char *value = mlt_properties_get( this, name );
@@ -155,12 +176,51 @@ static inline void mlt_properties_do_mirror( mlt_properties this, char *name )
 	}
 }
 
+/** 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;
+}
+
+/** Return the ref count of this object.
+*/
+
+int mlt_properties_ref_count( mlt_properties this )
+{
+	if ( this != NULL )
+	{
+		property_list *list = this->local;
+		return list->ref_count;
+	}
+	return 0;
+}
+
 /** Allow the specification of a mirror.
 */
 
 void mlt_properties_mirror( mlt_properties this, mlt_properties that )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	list->mirror = that;
 }
 
@@ -186,7 +246,7 @@ int mlt_properties_inherit( mlt_properties this, mlt_properties that )
 /** 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 mlt_properties_pass( mlt_properties this, mlt_properties that, const char *prefix )
 {
 	int count = mlt_properties_count( that );
 	int length = strlen( prefix );
@@ -207,9 +267,9 @@ int mlt_properties_pass( mlt_properties this, mlt_properties that, char *prefix
 /** Locate a property by name
 */
 
-static inline mlt_property mlt_properties_find( mlt_properties this, char *name )
+static inline mlt_property mlt_properties_find( mlt_properties this, const char *name )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	mlt_property value = NULL;
 	int key = generate_hash( name );
 	int i = list->hash[ key ] - 1;
@@ -234,16 +294,16 @@ static inline mlt_property mlt_properties_find( mlt_properties this, char *name
 /** Add a new property.
 */
 
-static mlt_property mlt_properties_add( mlt_properties this, char *name )
+static mlt_property mlt_properties_add( mlt_properties this, const 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
 	if ( list->count == list->size )
 	{
 		list->size += 50;
-		list->name = realloc( list->name, list->size * sizeof( char * ) );
+		list->name = realloc( list->name, list->size * sizeof( const char * ) );
 		list->value = realloc( list->value, list->size * sizeof( mlt_property ) );
 	}
 
@@ -262,7 +322,7 @@ static mlt_property mlt_properties_add( mlt_properties this, char *name )
 /** Fetch a property by name - this includes add if not found.
 */
 
-static mlt_property mlt_properties_fetch( mlt_properties this, char *name )
+static mlt_property mlt_properties_fetch( mlt_properties this, const char *name )
 {
 	// Try to find an existing property first
 	mlt_property property = mlt_properties_find( this, name );
@@ -278,7 +338,7 @@ static mlt_property mlt_properties_fetch( mlt_properties this, char *name )
 /** Set the property.
 */
 
-int mlt_properties_set( mlt_properties this, char *name, char *value )
+int mlt_properties_set( mlt_properties this, const char *name, const char *value )
 {
 	int error = 1;
 
@@ -286,11 +346,70 @@ 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 )
+	{
+		fprintf( stderr, "Whoops - %s not found (should never occur)\n", name );
+	}
+	else if ( value == NULL )
+	{
+		error = mlt_property_set_string( property, value );
+		mlt_properties_do_mirror( this, name );
+	}
+	else if ( *value != '@' )
 	{
 		error = mlt_property_set_string( property, value );
 		mlt_properties_do_mirror( this, name );
 	}
+	else if ( 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;
 }
@@ -298,7 +417,7 @@ int mlt_properties_set( mlt_properties this, char *name, char *value )
 /** Set or default the property.
 */
 
-int mlt_properties_set_or_default( mlt_properties this, char *name, char *value, char *def )
+int mlt_properties_set_or_default( mlt_properties this, const char *name, const char *value, const char *def )
 {
 	return mlt_properties_set( this, name, value == NULL ? def : value );
 }
@@ -306,7 +425,7 @@ int mlt_properties_set_or_default( mlt_properties this, char *name, char *value,
 /** Get a string value by name.
 */
 
-char *mlt_properties_get( mlt_properties this, char *name )
+char *mlt_properties_get( mlt_properties this, const char *name )
 {
 	mlt_property value = mlt_properties_find( this, name );
 	return value == NULL ? NULL : mlt_property_get_string( value );
@@ -317,7 +436,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;
@@ -328,7 +447,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;
@@ -339,7 +458,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;
@@ -350,34 +469,39 @@ 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;
 }
 
 /** Set a value by parsing a name=value string
 */
 
-int mlt_properties_parse( mlt_properties this, char *namevalue )
+int mlt_properties_parse( mlt_properties this, const 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 );
@@ -391,7 +515,7 @@ int mlt_properties_parse( mlt_properties this, char *namevalue )
 /** Get a value associated to the name.
 */
 
-int mlt_properties_get_int( mlt_properties this, char *name )
+int mlt_properties_get_int( mlt_properties this, const char *name )
 {
 	mlt_property value = mlt_properties_find( this, name );
 	return value == NULL ? 0 : mlt_property_get_int( value );
@@ -400,7 +524,7 @@ int mlt_properties_get_int( mlt_properties this, char *name )
 /** Set a value associated to the name.
 */
 
-int mlt_properties_set_int( mlt_properties this, char *name, int value )
+int mlt_properties_set_int( mlt_properties this, const char *name, int value )
 {
 	int error = 1;
 
@@ -414,13 +538,15 @@ 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;
 }
 
 /** Get a value associated to the name.
 */
 
-double mlt_properties_get_double( mlt_properties this, char *name )
+double mlt_properties_get_double( mlt_properties this, const char *name )
 {
 	mlt_property value = mlt_properties_find( this, name );
 	return value == NULL ? 0 : mlt_property_get_double( value );
@@ -429,7 +555,7 @@ double mlt_properties_get_double( mlt_properties this, char *name )
 /** Set a value associated to the name.
 */
 
-int mlt_properties_set_double( mlt_properties this, char *name, double value )
+int mlt_properties_set_double( mlt_properties this, const char *name, double value )
 {
 	int error = 1;
 
@@ -443,13 +569,15 @@ 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;
 }
 
 /** Get a value associated to the name.
 */
 
-mlt_position mlt_properties_get_position( mlt_properties this, char *name )
+mlt_position mlt_properties_get_position( mlt_properties this, const char *name )
 {
 	mlt_property value = mlt_properties_find( this, name );
 	return value == NULL ? 0 : mlt_property_get_position( value );
@@ -458,7 +586,7 @@ mlt_position mlt_properties_get_position( mlt_properties this, char *name )
 /** Set a value associated to the name.
 */
 
-int mlt_properties_set_position( mlt_properties this, char *name, mlt_position value )
+int mlt_properties_set_position( mlt_properties this, const char *name, mlt_position value )
 {
 	int error = 1;
 
@@ -472,13 +600,15 @@ 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;
 }
 
 /** Get a value associated to the name.
 */
 
-void *mlt_properties_get_data( mlt_properties this, char *name, int *length )
+void *mlt_properties_get_data( mlt_properties this, const char *name, int *length )
 {
 	mlt_property value = mlt_properties_find( this, name );
 	return value == NULL ? NULL : mlt_property_get_data( value, length );
@@ -487,7 +617,7 @@ void *mlt_properties_get_data( mlt_properties this, char *name, int *length )
 /** Set a value associated to the name.
 */
 
-int mlt_properties_set_data( mlt_properties this, char *name, void *value, int length, mlt_destructor destroy, mlt_serialiser serialise )
+int mlt_properties_set_data( mlt_properties this, const char *name, void *value, int length, mlt_destructor destroy, mlt_serialiser serialise )
 {
 	int error = 1;
 
@@ -498,19 +628,21 @@ 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;
 }
 
 /** Rename a property.
 */
 
-int mlt_properties_rename( mlt_properties this, char *source, char *dest )
+int mlt_properties_rename( mlt_properties this, const char *source, const char *dest )
 {
 	mlt_property value = mlt_properties_find( this, dest );
 
 	if ( value == NULL )
 	{
-		property_list *list = this->private;
+		property_list *list = this->local;
 		int i = 0;
 
 		// Locate the item 
@@ -534,10 +666,29 @@ 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, const char *title, FILE *output )
+{
+	fprintf( output, "%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 ] ) );
+			else
+				fprintf( output, ", %s=%p", list->name[ i ], mlt_properties_get_data( this, list->name[ i ], NULL ) );
+		fprintf( output, " ]" );
+	}
+	fprintf( output, "\n" );
 }
 
 /** Close the list.
@@ -545,34 +696,46 @@ void mlt_properties_dump( mlt_properties this, FILE *output )
 
 void mlt_properties_close( mlt_properties this )
 {
-	if ( this != NULL )
+	if ( this != NULL && mlt_properties_dec_ref( this ) <= 0 )
 	{
-		property_list *list = this->private;
-		int index = 0;
-
-		// Clean up names and values
-		for ( index = list->count - 1; index >= 0; index -- )
+		if ( this->close != NULL )
 		{
-			free( list->name[ index ] );
-			mlt_property_close( list->value[ index ] );
+			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 );
-
-		// Free this now if this has no child
-		if ( this->child == NULL )
-			free( this );
+#if _MLT_PROPERTY_CHECKS_ == 1
+			// Show debug info
+			mlt_properties_debug( this, "Closing", stderr );
+#endif
 
 #ifdef _MLT_PROPERTY_CHECKS_
-		// Increment destroyed count
-		properties_destroyed ++;
+			// 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 );
+			// 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 );
+		}
 	}
 }