X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=cf6c79293165ab9bceccbd11115a19e1465341fe;hb=51de85d7a61e44bde5395629af348d9ca96ee13b;hp=d4d14cf48bba69fa2f6ac6faa8bb4627871452a5;hpb=a2b4b63a98cff9bbf979f446d0351d8978365518;p=melted

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index d4d14cf..cf6c792 100644
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -42,21 +42,38 @@ typedef struct
 }
 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 local structure
+		this->local = calloc( sizeof( property_list ), 1 );
+	}
 
-	return this->private == NULL;
+	// Check that initialisation was successful
+	return this != NULL && this->local == NULL;
 }
 
 /** Constructor for stand alone object.
@@ -100,7 +117,7 @@ mlt_properties mlt_properties_load( char *filename )
 				temp[ strlen( temp ) - 1 ] = '\0';
 
 				// Parse and set the property
-				if ( strcmp( temp, "" ) )
+				if ( strcmp( temp, "" ) && temp[ 0 ] != '#' )
 					mlt_properties_parse( this, temp );
 			}
 
@@ -129,7 +146,7 @@ static inline int generate_hash( char *name )
 
 static inline void mlt_properties_do_mirror( mlt_properties this, char *name )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	if ( list->mirror != NULL ) 
 	{
 		char *value = mlt_properties_get( this, name );
@@ -143,7 +160,7 @@ static inline void mlt_properties_do_mirror( mlt_properties this, char *name )
 
 void mlt_properties_mirror( mlt_properties this, mlt_properties that )
 {
-	property_list *list = this->private;
+	property_list *list = this->local;
 	list->mirror = that;
 }
 
@@ -192,7 +209,7 @@ 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 key = generate_hash( name );
 	int i = list->hash[ key ] - 1;
@@ -219,7 +236,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
@@ -300,7 +317,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;
@@ -311,7 +328,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;
@@ -322,7 +339,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;
@@ -333,7 +350,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;
 }
 
@@ -343,24 +360,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 );
@@ -493,7 +515,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 
@@ -517,10 +539,11 @@ 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 ] ) );
 }
 
 /** Close the list.
@@ -528,23 +551,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->local;
+		int index = 0;
 
-	// Clear up the list
-	free( list->name );
-	free( list->value );
-	free( list );
+		// 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 );
+		// 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
+	}
 }