X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=1d13714634b051a3e815981dd76650378de08452;hb=7ed168fe4e839d9cfa97b844f45cfb4ee2f63f71;hp=cf6c79293165ab9bceccbd11115a19e1465341fe;hpb=fa0d65478efe5d80e0affa58095109800a5cba71;p=melted diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c index cf6c792..1d13714 100644 --- a/src/framework/mlt_properties.c +++ b/src/framework/mlt_properties.c @@ -25,6 +25,7 @@ #include #include #include +#include /* ---------------- // 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_ + #ifdef _MLT_PROPERTY_CHECKS_ static int properties_created = 0; static int properties_destroyed = 0; @@ -70,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 @@ -155,6 +162,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. */ @@ -286,11 +319,61 @@ 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; } @@ -419,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; } @@ -448,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; } @@ -477,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; } @@ -503,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; } @@ -546,39 +637,65 @@ 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 ] ) ); + 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 ); - // Show current stats - these should match when the app is closed - fprintf( stderr, "Created %d, destroyed %d\n", properties_created, 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 ); #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 ); + } } }