X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=01c4ba2d9a736a1ed04565d238abe14281ec0b27;hb=ebcbb3571620a43fe24b3f8fa0161096ef628dbe;hp=895be28a0abb846a7019621bcce440c517f83fc2;hpb=4a27595beb7047b430cc2df49865e269c0a0eef4;p=melted diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c index 895be28..01c4ba2 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_ + #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 @@ -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 ); @@ -156,6 +176,32 @@ 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; +} + /** Allow the specification of a mirror. */ @@ -341,6 +387,8 @@ 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; } @@ -468,6 +516,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; } @@ -497,6 +547,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; } @@ -526,6 +578,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; } @@ -552,6 +606,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; } @@ -595,39 +651,67 @@ 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, 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 ] ) ); + else + fprintf( output, ", %s=%p", list->name[ i ], mlt_properties_get_data( this, list->name[ i ], NULL ) ); + fprintf( output, " ]" ); + } + fprintf( stderr, "\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 ); } - - // 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 ); + else + { + property_list *list = this->local; + int index = 0; #ifdef _MLT_PROPERTY_CHECKS_ - // Increment destroyed count - properties_destroyed ++; + // Show debug info + mlt_properties_debug( this, "Closing", stderr ); + + // 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 ); + } } }