#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
/* ---------------- // Private Implementation // ---------------- */
}
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
- // Assign the child of the object
- this->child = child;
+ // NULL all methods
+ memset( this, 0, sizeof( struct mlt_properties_s ) );
- // Allocate the private structure
- this->private = calloc( sizeof( property_list ), 1 );
+ // Assign the child of the object
+ this->child = child;
- return this->private == NULL;
+ // Allocate the local structure
+ this->local = calloc( sizeof( property_list ), 1 );
+ }
+
+ // Check that initialisation was successful
+ return this != NULL && this->local == NULL;
}
/** Constructor for stand alone object.
temp[ strlen( temp ) - 1 ] = '\0';
// Parse and set the property
- if ( strcmp( temp, "" ) )
+ if ( strcmp( temp, "" ) && temp[ 0 ] != '#' )
mlt_properties_parse( this, temp );
}
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 );
void mlt_properties_mirror( mlt_properties this, mlt_properties that )
{
- property_list *list = this->private;
+ property_list *list = this->local;
list->mirror = that;
}
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;
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
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 );
+ }
return error;
}
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;
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;
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;
int mlt_properties_count( mlt_properties this )
{
- property_list *list = this->private;
+ property_list *list = this->local;
return list->count;
}
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 );
if ( value == NULL )
{
- property_list *list = this->private;
+ property_list *list = this->local;
int i = 0;
// Locate the item
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.
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 ] );
+ }
- // Free this now if this has no child
- if ( this->child == NULL )
- free( this );
+ // 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 );
+
+#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
+ }
}
projects / melted / blobdiff