X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=9fd2025ed78a25baaeead3c2958de01c12070163;hb=63dc2f08b9ec162234aa8d6688bf56ec71349acb;hp=895be28a0abb846a7019621bcce440c517f83fc2;hpb=4a27595beb7047b430cc2df49865e269c0a0eef4;p=melted

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index 895be28..9fd2025 100644
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -40,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;
@@ -71,6 +74,9 @@ int mlt_properties_init( mlt_properties this, void *child )
 
 		// 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
@@ -95,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( );
@@ -110,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 ) )
@@ -117,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 );
@@ -131,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;
@@ -145,7 +165,7 @@ 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->local;
 	if ( list->mirror != NULL ) 
@@ -156,7 +176,46 @@ static inline void mlt_properties_do_mirror( mlt_properties this, char *name )
 	}
 }
 
-/** Allow the specification of a mirror.
+/** 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;
+}
+
+/** Mirror properties set on 'this' to 'that'.
 */
 
 void mlt_properties_mirror( mlt_properties this, mlt_properties that )
@@ -187,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 );
@@ -205,10 +264,11 @@ int mlt_properties_pass( mlt_properties this, mlt_properties that, char *prefix
 	return 0;
 }
 
+
 /** 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->local;
 	mlt_property value = NULL;
@@ -235,7 +295,7 @@ 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->local;
 	int key = generate_hash( name );
@@ -244,7 +304,7 @@ static mlt_property mlt_properties_add( mlt_properties this, char *name )
 	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 ) );
 	}
 
@@ -263,7 +323,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 );
@@ -276,10 +336,56 @@ static mlt_property mlt_properties_fetch( mlt_properties this, char *name )
 	return property;
 }
 
+/** Pass property 'name' from 'that' to 'this' 
+* Who to blame: Zach <zachary.drew@gmail.com>
+*/
+
+void mlt_properties_pass_property( mlt_properties this, mlt_properties that, const char *name )
+{
+	// Make sure the source property isn't null.
+	mlt_property that_prop = mlt_properties_find( that, name );
+	if( that_prop == NULL )
+		return;
+
+	mlt_property_pass( mlt_properties_fetch( this, name ), that_prop );
+}
+
+/** Pass all properties from 'that' to 'this' as found in comma seperated 'list'.
+* Who to blame: Zach <zachary.drew@gmail.com>
+*/
+
+int mlt_properties_pass_list( mlt_properties this, mlt_properties that, const char *list )
+{
+	char *props = strdup( list );
+	char *ptr = props;
+	char *delim = " ,\t\n";	// Any combination of spaces, commas, tabs, and newlines
+	int count, done = 0;
+
+	while( !done )
+	{
+		count = strcspn( ptr, delim );
+
+		if( ptr[count] == '\0' )
+			done = 1;
+		else
+			ptr[count] = '\0';	// Make it a real string
+
+		mlt_properties_pass_property( this, that, ptr );
+
+		ptr += count + 1;
+		ptr += strspn( ptr, delim );
+	}
+
+	free( props );
+
+	return 0;
+}
+
+
 /** 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;
 
@@ -287,12 +393,21 @@ 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 && ( value == NULL || value[ 0 ] != '@' ) )
+	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 ( property != NULL && value[ 0 ] == '@' )
+	else if ( value[ 0 ] == '@' )
 	{
 		int total = 0;
 		int current = 0;
@@ -341,13 +456,15 @@ int mlt_properties_set( mlt_properties this, char *name, char *value )
 		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 )
+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 );
 }
@@ -355,7 +472,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 );
@@ -406,7 +523,7 @@ int mlt_properties_count( mlt_properties this )
 /** 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 = NULL;
@@ -445,7 +562,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 );
@@ -454,7 +571,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;
 
@@ -468,13 +585,46 @@ 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 )
+int64_t mlt_properties_get_int64( mlt_properties this, const char *name )
+{
+	mlt_property value = mlt_properties_find( this, name );
+	return value == NULL ? 0 : mlt_property_get_int64( value );
+}
+
+/** Set a value associated to the name.
+*/
+
+int mlt_properties_set_int64( mlt_properties this, const char *name, int64_t value )
+{
+	int error = 1;
+
+	// Fetch the property to work with
+	mlt_property property = mlt_properties_fetch( this, name );
+
+	// Set it if not NULL
+	if ( property != NULL )
+	{
+		error = mlt_property_set_int64( property, 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, const char *name )
 {
 	mlt_property value = mlt_properties_find( this, name );
 	return value == NULL ? 0 : mlt_property_get_double( value );
@@ -483,7 +633,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;
 
@@ -497,13 +647,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 );
@@ -512,7 +664,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;
 
@@ -526,13 +678,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 );
@@ -541,7 +695,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;
 
@@ -552,13 +706,15 @@ 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 );
 
@@ -595,39 +751,69 @@ void mlt_properties_dump( mlt_properties this, FILE *output )
 			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.
 */
 
 void mlt_properties_close( mlt_properties this )
 {
-	if ( this != NULL )
+	if ( this != NULL && mlt_properties_dec_ref( this ) <= 0 )
 	{
-		property_list *list = this->local;
-		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 );
+		}
 	}
 }