#include "mlt_property.h"
#include "mlt_deque.h"
#include "mlt_log.h"
+#include "mlt_factory.h"
#include <stdio.h>
#include <stdlib.h>
#include <pthread.h>
#include <sys/types.h>
#include <dirent.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <locale.h>
+#define PRESETS_DIR "/presets"
/** \brief private implementation of the property list */
mlt_properties mirror;
int ref_count;
pthread_mutex_t mutex;
+ locale_t locale;
}
property_list;
*
* This does allocate its ::property_list, and it adds a reference count.
* \public \memberof mlt_properties_s
- * \param this the properties structure to initialize
+ * \param self the properties structure to initialize
* \param child an opaque pointer to a subclass object
* \return true if failed
*/
-int mlt_properties_init( mlt_properties this, void *child )
+int mlt_properties_init( mlt_properties self, void *child )
{
- if ( this != NULL )
+ if ( self != NULL )
{
#ifdef _MLT_PROPERTY_CHECKS_
// Increment number of properties created
#endif
// NULL all methods
- memset( this, 0, sizeof( struct mlt_properties_s ) );
+ memset( self, 0, sizeof( struct mlt_properties_s ) );
// Assign the child of the object
- this->child = child;
+ self->child = child;
// Allocate the local structure
- this->local = calloc( sizeof( property_list ), 1 );
+ self->local = calloc( sizeof( property_list ), 1 );
// Increment the ref count
- ( ( property_list * )this->local )->ref_count = 1;
- pthread_mutex_init( &( ( property_list * )this->local )->mutex, NULL );;
+ ( ( property_list * )self->local )->ref_count = 1;
+ pthread_mutex_init( &( ( property_list * )self->local )->mutex, NULL );;
}
// Check that initialisation was successful
- return this != NULL && this->local == NULL;
+ return self != NULL && self->local == NULL;
}
/** Create a properties object.
mlt_properties mlt_properties_new( )
{
// Construct a standalone properties object
- mlt_properties this = calloc( sizeof( struct mlt_properties_s ), 1 );
+ mlt_properties self = calloc( sizeof( struct mlt_properties_s ), 1 );
- // Initialise this
- mlt_properties_init( this, NULL );
+ // Initialise self
+ mlt_properties_init( self, NULL );
// Return the pointer
- return this;
+ return self;
+}
+
+/** Set the numeric locale used for string/double conversions.
+ *
+ * \public \memberof mlt_properties_s
+ * \param self a properties list
+ * \param locale the locale name
+ * \return true if error
+ */
+
+int mlt_properties_set_lcnumeric( mlt_properties self, const char *locale )
+{
+ int error = 0;
+
+ if ( self && locale )
+ {
+ property_list *list = self->local;
+
+#if defined(__linux__) || defined(__DARWIN__)
+ if ( list->locale )
+ freelocale( list->locale );
+ list->locale = newlocale( LC_NUMERIC_MASK, locale, NULL );
+#endif
+ error = list->locale == NULL;
+ }
+ else
+ error = 1;
+
+ return error;
+}
+
+/** Get the numeric locale for this properties object.
+ *
+ * Do not free the result.
+ * \public \memberof mlt_properties_s
+ * \param self a properties list
+ * \return the locale name if this properties has a specific locale it is using, NULL otherwise
+ */
+
+const char* mlt_properties_get_lcnumeric( mlt_properties self )
+{
+ property_list *list = self->local;
+ const char *result = NULL;
+
+ if ( list->locale )
+ {
+#if defined(__DARWIN__)
+ result = querylocale( LC_NUMERIC, list->locale );
+#elif defined(__linux__)
+ result = list->locale->__names[ LC_NUMERIC ];
+#else
+ // TODO: not yet sure what to do on other platforms
+#endif
+ }
+ return result;
+}
+
+static int load_properties( mlt_properties self, const char *filename )
+{
+ // Open the file
+ FILE *file = fopen( filename, "r" );
+
+ // Load contents of file
+ if ( file != NULL )
+ {
+ // Temp string
+ char temp[ 1024 ];
+ char last[ 1024 ] = "";
+
+ // Read each string from the file
+ while( fgets( temp, 1024, file ) )
+ {
+ // 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( self, temp );
+ }
+
+ // Close the file
+ fclose( file );
+ }
+ return file? 0 : errno;
}
/** Create a properties object by reading a .properties text file.
* Free the properties object with mlt_properties_close().
* \deprecated Please start using mlt_properties_parse_yaml().
* \public \memberof mlt_properties_s
- * \param filename a string contain the absolute file name
+ * \param filename the absolute file name
* \return a new properties object
*/
mlt_properties mlt_properties_load( const char *filename )
{
// Construct a standalone properties object
- mlt_properties this = mlt_properties_new( );
+ mlt_properties self = mlt_properties_new( );
- if ( this != NULL )
- {
- // Open the file
- FILE *file = fopen( filename, "r" );
+ if ( self != NULL )
+ load_properties( self, filename );
- // Load contents of file
- if ( file != NULL )
- {
- // Temp string
- char temp[ 1024 ];
- char last[ 1024 ] = "";
+ // Return the pointer
+ return self;
+}
- // Read each string from the file
- while( fgets( temp, 1024, file ) )
- {
- // Chomp the string
- temp[ strlen( temp ) - 1 ] = '\0';
+/** Set properties from a preset.
+ *
+ * Presets are typically installed to $prefix/share/mlt/presets/{type}/{service}/[{profile}/]{name}.
+ * For example, "/usr/share/mlt/presets/consumer/avformat/dv_ntsc_wide/DVD"
+ * could be an encoding preset for a widescreen NTSC DVD Video.
+ * Do not specify the type and service in the preset name parameter; these are
+ * inferred automatically from the service to which you are applying the preset.
+ * Using the example above and assuming you are calling this function on the
+ * avformat consumer, the name passed to the function should simply be DVD.
+ * Note that the profile portion of the path is optional, but a profile-specific
+ * preset with the same name as a more generic one is given a higher priority.
+ * \todo Look in a user-specific location - somewhere in the home directory.
+ *
+ * \public \memberof mlt_properties_s
+ * \param self a properties list
+ * \param name the name of a preset in a well-known location or the explicit path
+ * \return true if error
+ */
- // 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';
- }
+int mlt_properties_preset( mlt_properties self, const char *name )
+{
+ struct stat stat_buff;
- // Parse and set the property
- if ( strcmp( temp, "" ) && temp[ 0 ] != '#' )
- mlt_properties_parse( this, temp );
- }
+ // validate input
+ if ( !( self && name && strlen( name ) ) )
+ return 1;
- // Close the file
- fclose( file );
+ // See if name is an explicit file
+ if ( ! stat( name, &stat_buff ) )
+ {
+ return load_properties( self, name );
+ }
+ else
+ {
+ // Look for profile-specific preset before a generic one.
+ char *data = getenv( "MLT_PRESETS_PATH" );
+ const char *type = mlt_properties_get( self, "mlt_type" );
+ const char *service = mlt_properties_get( self, "mlt_service" );
+ const char *profile = mlt_environment( "MLT_PROFILE" );
+ int error = 0;
+
+ if ( data )
+ {
+ data = strdup( data );
+ }
+ else
+ {
+ data = malloc( strlen( mlt_environment( "MLT_DATA" ) ) + strlen( PRESETS_DIR ) + 1 );
+ strcpy( data, mlt_environment( "MLT_DATA" ) );
+ strcat( data, PRESETS_DIR );
+ }
+ if ( data && type && service )
+ {
+ char *path = malloc( 5 + strlen(name) + strlen(data) + strlen(type) + strlen(service) + ( profile? strlen(profile) : 0 ) );
+ sprintf( path, "%s/%s/%s/%s/%s", data, type, service, profile, name );
+ if ( load_properties( self, path ) )
+ {
+ sprintf( path, "%s/%s/%s/%s", data, type, service, name );
+ error = load_properties( self, path );
+ }
+ free( path );
}
+ else
+ {
+ error = 1;
+ }
+ free( data );
+ return error;
}
-
- // Return the pointer
- return this;
}
/** Generate a hash key.
return hash;
}
-/** Copy a serializable property to properties list that is mirroring this one.
+/** Copy a serializable property to a properties list that is mirroring this one.
*
- * Special case - when a container (such as fezzik) is protecting another
+ * Special case - when a container (such as loader) is protecting another
* producer, we need to ensure that properties are passed through to the
* real producer.
* \private \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the name of the property to copy
*/
-static inline void mlt_properties_do_mirror( mlt_properties this, const char *name )
+static inline void mlt_properties_do_mirror( mlt_properties self, const char *name )
{
- property_list *list = this->local;
+ property_list *list = self->local;
if ( list->mirror != NULL )
{
- char *value = mlt_properties_get( this, name );
+ char *value = mlt_properties_get( self, name );
if ( value != NULL )
mlt_properties_set( list->mirror, name, value );
}
/** Increment the reference count.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \return the new reference count
*/
-int mlt_properties_inc_ref( mlt_properties this )
+int mlt_properties_inc_ref( mlt_properties self )
{
int result = 0;
- if ( this != NULL )
+ if ( self != NULL )
{
- property_list *list = this->local;
+ property_list *list = self->local;
pthread_mutex_lock( &list->mutex );
result = ++ list->ref_count;
pthread_mutex_unlock( &list->mutex );
/** Decrement the reference count.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \return the new reference count
*/
-int mlt_properties_dec_ref( mlt_properties this )
+int mlt_properties_dec_ref( mlt_properties self )
{
int result = 0;
- if ( this != NULL )
+ if ( self != NULL )
{
- property_list *list = this->local;
+ property_list *list = self->local;
pthread_mutex_lock( &list->mutex );
result = -- list->ref_count;
pthread_mutex_unlock( &list->mutex );
/** Get the reference count.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \return the current reference count
*/
-int mlt_properties_ref_count( mlt_properties this )
+int mlt_properties_ref_count( mlt_properties self )
{
- if ( this != NULL )
+ if ( self != NULL )
{
- property_list *list = this->local;
+ property_list *list = self->local;
return list->ref_count;
}
return 0;
* call this before setting the properties that you wish to copy.
* \public \memberof mlt_properties_s
* \param that the properties which will receive copies of the properties as they are set.
- * \param this the properties to mirror
+ * \param self the properties to mirror
*/
-void mlt_properties_mirror( mlt_properties this, mlt_properties that )
+void mlt_properties_mirror( mlt_properties self, mlt_properties that )
{
- property_list *list = this->local;
+ property_list *list = self->local;
list->mirror = that;
}
/** Copy all serializable properties to another properties list.
*
* \public \memberof mlt_properties_s
- * \param this The properties to copy to
+ * \param self The properties to copy to
* \param that The properties to copy from
* \return false
*/
-int mlt_properties_inherit( mlt_properties this, mlt_properties that )
+int mlt_properties_inherit( mlt_properties self, mlt_properties that )
{
int count = mlt_properties_count( that );
int i = 0;
if ( value != NULL )
{
char *name = mlt_properties_get_name( that, i );
- mlt_properties_set( this, name, value );
+ mlt_properties_set( self, name, value );
}
}
return 0;
/** Pass all serializable properties that match a prefix to another properties object
*
* \public \memberof mlt_properties_s
- * \param this the properties to copy to
+ * \param self the properties to copy to
* \param that The properties to copy from
* \param prefix the property names to match (required)
* \return false
*/
-int mlt_properties_pass( mlt_properties this, mlt_properties that, const char *prefix )
+int mlt_properties_pass( mlt_properties self, mlt_properties that, const char *prefix )
{
int count = mlt_properties_count( that );
int length = strlen( prefix );
{
char *value = mlt_properties_get_value( that, i );
if ( value != NULL )
- mlt_properties_set( this, name + length, value );
+ mlt_properties_set( self, name + length, value );
}
}
return 0;
/** Locate a property by name.
*
* \private \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to lookup by name
* \return the property or NULL for failure
*/
-static inline mlt_property mlt_properties_find( mlt_properties this, const char *name )
+static inline mlt_property mlt_properties_find( mlt_properties self, const char *name )
{
- property_list *list = this->local;
+ property_list *list = self->local;
mlt_property value = NULL;
int key = generate_hash( name );
- int i = list->hash[ key ] - 1;
+ mlt_properties_lock( self );
+
+ int i = list->hash[ key ] - 1;
if ( i >= 0 )
{
// Check if we're hashed
if ( name[ 0 ] == list->name[ i ][ 0 ] && !strcmp( list->name[ i ], name ) )
value = list->value[ i ];
}
+ mlt_properties_unlock( self );
return value;
}
/** Add a new property.
*
* \private \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the name of the new property
* \return the new property
*/
-static mlt_property mlt_properties_add( mlt_properties this, const char *name )
+static mlt_property mlt_properties_add( mlt_properties self, const char *name )
{
- property_list *list = this->local;
+ property_list *list = self->local;
int key = generate_hash( name );
+ mlt_property result;
+
+ mlt_properties_lock( self );
// Check that we have space and resize if necessary
if ( list->count == list->size )
list->hash[ key ] = list->count + 1;
// Return and increment count accordingly
- return list->value[ list->count ++ ];
+ result = list->value[ list->count ++ ];
+
+ mlt_properties_unlock( self );
+
+ return result;
}
/** Fetch a property by name and add one if not found.
*
* \private \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to lookup or add
* \return the property
*/
-static mlt_property mlt_properties_fetch( mlt_properties this, const char *name )
+static mlt_property mlt_properties_fetch( mlt_properties self, const char *name )
{
// Try to find an existing property first
- mlt_property property = mlt_properties_find( this, name );
+ mlt_property property = mlt_properties_find( self, name );
// If it wasn't found, create one
if ( property == NULL )
- property = mlt_properties_add( this, name );
+ property = mlt_properties_add( self, name );
// Return the property
return property;
*
* \public \memberof mlt_properties_s
* \author Zach <zachary.drew@gmail.com>
- * \param this the properties to copy to
+ * \param self the properties to copy to
* \param that the properties to copy from
* \param name the name of the property to copy
*/
-void mlt_properties_pass_property( mlt_properties this, mlt_properties that, const char *name )
+void mlt_properties_pass_property( mlt_properties self, 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 );
+ mlt_property_pass( mlt_properties_fetch( self, name ), that_prop );
}
/** Copy all properties specified in a comma-separated list to another properties list.
* White space is also a delimiter.
* \public \memberof mlt_properties_s
* \author Zach <zachary.drew@gmail.com>
- * \param this the properties to copy to
+ * \param self the properties to copy to
* \param that the properties to copy from
* \param list a delimited list of property names
* \return false
*/
-int mlt_properties_pass_list( mlt_properties this, mlt_properties that, const char *list )
+int mlt_properties_pass_list( mlt_properties self, mlt_properties that, const char *list )
{
char *props = strdup( list );
char *ptr = props;
else
ptr[count] = '\0'; // Make it a real string
- mlt_properties_pass_property( this, that, ptr );
+ mlt_properties_pass_property( self, that, ptr );
ptr += count + 1;
ptr += strspn( ptr, delim );
/** Set a property to a string.
+ *
+ * The property name "properties" is reserved to load the preset in \p value.
+ * When the value begins with '@' then it is interpreted as a very simple math
+ * expression containing only the +, -, *, and / operators.
+ * The event "property-changed" is fired after the property has been set.
*
* This makes a copy of the string value you supply.
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to set
* \param value the property's new value
* \return true if error
*/
-int mlt_properties_set( mlt_properties this, const char *name, const char *value )
+int mlt_properties_set( mlt_properties self, const char *name, const char *value )
{
int error = 1;
// Fetch the property to work with
- mlt_property property = mlt_properties_fetch( this, name );
+ mlt_property property = mlt_properties_fetch( self, name );
// Set it if not NULL
if ( property == NULL )
else if ( value == NULL )
{
error = mlt_property_set_string( property, value );
- mlt_properties_do_mirror( this, name );
+ mlt_properties_do_mirror( self, name );
}
else if ( *value != '@' )
{
error = mlt_property_set_string( property, value );
- mlt_properties_do_mirror( this, name );
+ mlt_properties_do_mirror( self, name );
+ if ( !strcmp( name, "properties" ) )
+ mlt_properties_preset( self, value );
}
else if ( value[ 0 ] == '@' )
{
if ( isdigit( id[ 0 ] ) )
current = atof( id );
else
- current = mlt_properties_get_double( this, id );
+ current = mlt_properties_get_double( self, id );
// Apply the operation
switch( op )
}
error = mlt_property_set_double( property, total );
- mlt_properties_do_mirror( this, name );
+ mlt_properties_do_mirror( self, name );
}
- mlt_events_fire( this, "property-changed", name, NULL );
+ mlt_events_fire( self, "property-changed", name, NULL );
return error;
}
*
* This makes a copy of the string value you supply.
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to set
* \param value the string value to set or NULL to use the default
* \param def the default string if value is NULL
* \return true if error
*/
-int mlt_properties_set_or_default( mlt_properties this, const char *name, const char *value, const char *def )
+int mlt_properties_set_or_default( mlt_properties self, const char *name, const char *value, const char *def )
{
- return mlt_properties_set( this, name, value == NULL ? def : value );
+ return mlt_properties_set( self, name, value == NULL ? def : value );
}
/** Get a string value by name.
* Do not free the returned string. It's lifetime is controlled by the property
* and this properties object.
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to get
* \return the property's string value or NULL if it does not exist
*/
-char *mlt_properties_get( mlt_properties this, const char *name )
+char *mlt_properties_get( mlt_properties self, const char *name )
{
- mlt_property value = mlt_properties_find( this, name );
- return value == NULL ? NULL : mlt_property_get_string( value );
+ mlt_property value = mlt_properties_find( self, name );
+ property_list *list = self->local;
+ return value == NULL ? NULL : mlt_property_get_string_l( value, list->locale );
}
/** Get a property name by index.
*
* Do not free the returned string.
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param index the numeric index of the property
* \return the name of the property or NULL if index is out of range
*/
-char *mlt_properties_get_name( mlt_properties this, int index )
+char *mlt_properties_get_name( mlt_properties self, int index )
{
- property_list *list = this->local;
+ property_list *list = self->local;
if ( index >= 0 && index < list->count )
return list->name[ index ];
return NULL;
*
* Do not free the returned string.
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param index the numeric index of the property
* \return the property value as a string or NULL if the index is out of range
*/
-char *mlt_properties_get_value( mlt_properties this, int index )
+char *mlt_properties_get_value( mlt_properties self, int index )
{
- property_list *list = this->local;
+ property_list *list = self->local;
if ( index >= 0 && index < list->count )
- return mlt_property_get_string( list->value[ index ] );
+ return mlt_property_get_string_l( list->value[ index ], list->locale );
return NULL;
}
* Do not free the returned pointer if you supplied a destructor function when you
* set this property.
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param index the numeric index of the property
* \param[out] size the size of the binary data in bytes or NULL if the index is out of range
*/
-void *mlt_properties_get_data_at( mlt_properties this, int index, int *size )
+void *mlt_properties_get_data_at( mlt_properties self, int index, int *size )
{
- property_list *list = this->local;
+ property_list *list = self->local;
if ( index >= 0 && index < list->count )
return mlt_property_get_data( list->value[ index ], size );
return NULL;
/** Return the number of items in the list.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \return the number of property objects
*/
-int mlt_properties_count( mlt_properties this )
+int mlt_properties_count( mlt_properties self )
{
- property_list *list = this->local;
+ property_list *list = self->local;
return list->count;
}
/** Set a value by parsing a name=value string.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param namevalue a string containing name and value delimited by '='
* \return true if there was an error
*/
-int mlt_properties_parse( mlt_properties this, const char *namevalue )
+int mlt_properties_parse( mlt_properties self, const char *namevalue )
{
char *name = strdup( namevalue );
char *value = NULL;
value = strdup( "" );
}
- error = mlt_properties_set( this, name, value );
+ error = mlt_properties_set( self, name, value );
free( name );
free( value );
/** Get an integer associated to the name.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to get
* \return The integer value, 0 if not found (which may also be a legitimate value)
*/
-int mlt_properties_get_int( mlt_properties this, const char *name )
+int mlt_properties_get_int( mlt_properties self, const char *name )
{
- mlt_property value = mlt_properties_find( this, name );
+ mlt_property value = mlt_properties_find( self, name );
return value == NULL ? 0 : mlt_property_get_int( value );
}
/** Set a property to an integer value.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to set
* \param value the integer
* \return true if error
*/
-int mlt_properties_set_int( mlt_properties this, const char *name, int value )
+int mlt_properties_set_int( mlt_properties self, const char *name, int value )
{
int error = 1;
// Fetch the property to work with
- mlt_property property = mlt_properties_fetch( this, name );
+ mlt_property property = mlt_properties_fetch( self, name );
// Set it if not NULL
if ( property != NULL )
{
error = mlt_property_set_int( property, value );
- mlt_properties_do_mirror( this, name );
+ mlt_properties_do_mirror( self, name );
}
- mlt_events_fire( this, "property-changed", name, NULL );
+ mlt_events_fire( self, "property-changed", name, NULL );
return error;
}
/** Get a 64-bit integer associated to the name.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to get
* \return the integer value, 0 if not found (which may also be a legitimate value)
*/
-int64_t mlt_properties_get_int64( mlt_properties this, const char *name )
+int64_t mlt_properties_get_int64( mlt_properties self, const char *name )
{
- mlt_property value = mlt_properties_find( this, name );
+ mlt_property value = mlt_properties_find( self, name );
return value == NULL ? 0 : mlt_property_get_int64( value );
}
/** Set a property to a 64-bit integer value.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to set
* \param value the integer
* \return true if error
*/
-int mlt_properties_set_int64( mlt_properties this, const char *name, int64_t value )
+int mlt_properties_set_int64( mlt_properties self, const char *name, int64_t value )
{
int error = 1;
// Fetch the property to work with
- mlt_property property = mlt_properties_fetch( this, name );
+ mlt_property property = mlt_properties_fetch( self, name );
// Set it if not NULL
if ( property != NULL )
{
error = mlt_property_set_int64( property, value );
- mlt_properties_do_mirror( this, name );
+ mlt_properties_do_mirror( self, name );
}
- mlt_events_fire( this, "property-changed", name, NULL );
+ mlt_events_fire( self, "property-changed", name, NULL );
return error;
}
/** Get a floating point value associated to the name.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to get
* \return the floating point, 0 if not found (which may also be a legitimate value)
*/
-double mlt_properties_get_double( mlt_properties this, const char *name )
+double mlt_properties_get_double( mlt_properties self, const char *name )
{
- mlt_property value = mlt_properties_find( this, name );
- return value == NULL ? 0 : mlt_property_get_double( value );
+ mlt_property value = mlt_properties_find( self, name );
+ property_list *list = self->local;
+ return value == NULL ? 0 : mlt_property_get_double_l( value, list->locale );
}
/** Set a property to a floating point value.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to set
* \param value the floating point value
* \return true if error
*/
-int mlt_properties_set_double( mlt_properties this, const char *name, double value )
+int mlt_properties_set_double( mlt_properties self, const char *name, double value )
{
int error = 1;
// Fetch the property to work with
- mlt_property property = mlt_properties_fetch( this, name );
+ mlt_property property = mlt_properties_fetch( self, name );
// Set it if not NULL
if ( property != NULL )
{
error = mlt_property_set_double( property, value );
- mlt_properties_do_mirror( this, name );
+ mlt_properties_do_mirror( self, name );
}
- mlt_events_fire( this, "property-changed", name, NULL );
+ mlt_events_fire( self, "property-changed", name, NULL );
return error;
}
/** Get a position value associated to the name.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to get
* \return the position, 0 if not found (which may also be a legitimate value)
*/
-mlt_position mlt_properties_get_position( mlt_properties this, const char *name )
+mlt_position mlt_properties_get_position( mlt_properties self, const char *name )
{
- mlt_property value = mlt_properties_find( this, name );
+ mlt_property value = mlt_properties_find( self, name );
return value == NULL ? 0 : mlt_property_get_position( value );
}
/** Set a property to a position value.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to get
* \param value the position
* \return true if error
*/
-int mlt_properties_set_position( mlt_properties this, const char *name, mlt_position value )
+int mlt_properties_set_position( mlt_properties self, const char *name, mlt_position value )
{
int error = 1;
// Fetch the property to work with
- mlt_property property = mlt_properties_fetch( this, name );
+ mlt_property property = mlt_properties_fetch( self, name );
// Set it if not NULL
if ( property != NULL )
{
error = mlt_property_set_position( property, value );
- mlt_properties_do_mirror( this, name );
+ mlt_properties_do_mirror( self, name );
}
- mlt_events_fire( this, "property-changed", name, NULL );
+ mlt_events_fire( self, "property-changed", name, NULL );
return error;
}
* Do not free the returned pointer if you supplied a destructor function
* when you set this property.
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to get
* \param[out] length The size of the binary data in bytes, if available (often it is not, you should know)
*/
-void *mlt_properties_get_data( mlt_properties this, const char *name, int *length )
+void *mlt_properties_get_data( mlt_properties self, const char *name, int *length )
{
- mlt_property value = mlt_properties_find( this, name );
+ mlt_property value = mlt_properties_find( self, name );
return value == NULL ? NULL : mlt_property_get_data( value, length );
}
/** Store binary data as a property.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param name the property to set
* \param value an opaque pointer to binary data
* \param length the size of the binary data in bytes (optional)
- * \param destroy a function to dellacate the binary data when the property is closed (optional)
+ * \param destroy a function to deallocate the binary data when the property is closed (optional)
* \param serialise a function that can serialize the binary data as text (optional)
* \return true if error
*/
-int mlt_properties_set_data( mlt_properties this, const char *name, void *value, int length, mlt_destructor destroy, mlt_serialiser serialise )
+int mlt_properties_set_data( mlt_properties self, const char *name, void *value, int length, mlt_destructor destroy, mlt_serialiser serialise )
{
int error = 1;
// Fetch the property to work with
- mlt_property property = mlt_properties_fetch( this, name );
+ mlt_property property = mlt_properties_fetch( self, name );
// Set it if not NULL
if ( property != NULL )
error = mlt_property_set_data( property, value, length, destroy, serialise );
- mlt_events_fire( this, "property-changed", name, NULL );
+ mlt_events_fire( self, "property-changed", name, NULL );
return error;
}
/** Rename a property.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param source the property to rename
* \param dest the new name
* \return true if the name is already in use
*/
-int mlt_properties_rename( mlt_properties this, const char *source, const char *dest )
+int mlt_properties_rename( mlt_properties self, const char *source, const char *dest )
{
- mlt_property value = mlt_properties_find( this, dest );
+ mlt_property value = mlt_properties_find( self, dest );
if ( value == NULL )
{
- property_list *list = this->local;
+ property_list *list = self->local;
int i = 0;
// Locate the item
+ mlt_properties_lock( self );
for ( i = 0; i < list->count; i ++ )
{
if ( !strcmp( list->name[ i ], source ) )
break;
}
}
+ mlt_properties_unlock( self );
}
return value != NULL;
/** Dump the properties to a file handle.
*
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param output a file handle
*/
-void mlt_properties_dump( mlt_properties this, FILE *output )
+void mlt_properties_dump( mlt_properties self, FILE *output )
{
- property_list *list = this->local;
+ property_list *list = self->local;
int i = 0;
for ( i = 0; i < list->count; 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 ] ) );
+ if ( mlt_properties_get( self, list->name[ i ] ) != NULL )
+ fprintf( output, "%s=%s\n", list->name[ i ], mlt_properties_get( self, list->name[ i ] ) );
}
/** Output the properties to a file handle.
*
* This version includes reference counts and does not put each property on a new line.
* \public \memberof mlt_properties_s
- * \param this a properties pointer
+ * \param self a properties pointer
* \param title a string to preface the output
* \param output a file handle
*/
-void mlt_properties_debug( mlt_properties this, const char *title, FILE *output )
+void mlt_properties_debug( mlt_properties self, const char *title, FILE *output )
{
if ( output == NULL ) output = stderr;
fprintf( output, "%s: ", title );
- if ( this != NULL )
+ if ( self != NULL )
{
- property_list *list = this->local;
+ property_list *list = self->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 ] ) );
+ if ( mlt_properties_get( self, list->name[ i ] ) != NULL )
+ fprintf( output, ", %s=%s", list->name[ i ], mlt_properties_get( self, list->name[ i ] ) );
else
- fprintf( output, ", %s=%p", list->name[ i ], mlt_properties_get_data( this, list->name[ i ], NULL ) );
+ fprintf( output, ", %s=%p", list->name[ i ], mlt_properties_get_data( self, list->name[ i ], NULL ) );
fprintf( output, " ]" );
}
fprintf( output, "\n" );
*
* This uses the dump format - one line per property.
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param filename the name of a file to create or overwrite
* \return true if there was an error
*/
-int mlt_properties_save( mlt_properties this, const char *filename )
+int mlt_properties_save( mlt_properties self, const char *filename )
{
int error = 1;
FILE *f = fopen( filename, "w" );
if ( f != NULL )
{
- mlt_properties_dump( this, f );
+ mlt_properties_dump( self, f );
fclose( f );
error = 0;
}
/** Compare the string or serialized value of two properties.
*
* \private \memberof mlt_properties_s
- * \param this a property
+ * \param self a property
* \param that a property
- * \return < 0 if 'this' less than 'that', 0 if equal, or > 0 if 'this' is greater than 'that'
+ * \return < 0 if \p self less than \p that, 0 if equal, or > 0 if \p self is greater than \p that
*/
-static int mlt_compare( const void *this, const void *that )
+static int mlt_compare( const void *self, const void *that )
{
- return strcmp( mlt_property_get_string( *( const mlt_property * )this ), mlt_property_get_string( *( const mlt_property * )that ) );
+ return strcmp( mlt_property_get_string( *( const mlt_property * )self ), mlt_property_get_string( *( const mlt_property * )that ) );
}
/** Get the contents of a directory.
* Entries in the list have a numeric name (running from 0 to count - 1). Only values change
* position if sort is enabled. Designed to be posix compatible (linux, os/x, mingw etc).
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param dirname the name of the directory
* \param pattern a wildcard pattern to filter the directory listing
* \param sort Do you want to sort the directory listing?
* \return the number of items in the directory listing
*/
-int mlt_properties_dir_list( mlt_properties this, const char *dirname, const char *pattern, int sort )
+int mlt_properties_dir_list( mlt_properties self, const char *dirname, const char *pattern, int sort )
{
DIR *dir = opendir( dirname );
char fullname[ 1024 ];
while( de != NULL )
{
- sprintf( key, "%d", mlt_properties_count( this ) );
+ sprintf( key, "%d", mlt_properties_count( self ) );
snprintf( fullname, 1024, "%s/%s", dirname, de->d_name );
if ( pattern == NULL )
- mlt_properties_set( this, key, fullname );
+ mlt_properties_set( self, key, fullname );
else if ( de->d_name[ 0 ] != '.' && mlt_fnmatch( pattern, de->d_name ) )
- mlt_properties_set( this, key, fullname );
+ mlt_properties_set( self, key, fullname );
de = readdir( dir );
}
closedir( dir );
}
- if ( sort && mlt_properties_count( this ) )
+ if ( sort && mlt_properties_count( self ) )
{
- property_list *list = this->local;
- qsort( list->value, mlt_properties_count( this ), sizeof( mlt_property ), mlt_compare );
+ property_list *list = self->local;
+ mlt_properties_lock( self );
+ qsort( list->value, mlt_properties_count( self ), sizeof( mlt_property ), mlt_compare );
+ mlt_properties_unlock( self );
}
- return mlt_properties_count( this );
+ return mlt_properties_count( self );
}
/** Close a properties object.
*
* Deallocates the properties object and everything it contains.
* \public \memberof mlt_properties_s
- * \param this a properties object
+ * \param self a properties object
*/
-void mlt_properties_close( mlt_properties this )
+void mlt_properties_close( mlt_properties self )
{
- if ( this != NULL && mlt_properties_dec_ref( this ) <= 0 )
+ if ( self != NULL && mlt_properties_dec_ref( self ) <= 0 )
{
- if ( this->close != NULL )
+ if ( self->close != NULL )
{
- this->close( this->close_object );
+ self->close( self->close_object );
}
else
{
- property_list *list = this->local;
+ property_list *list = self->local;
int index = 0;
#if _MLT_PROPERTY_CHECKS_ == 1
// Show debug info
- mlt_properties_debug( this, "Closing", stderr );
+ mlt_properties_debug( self, "Closing", stderr );
#endif
#ifdef _MLT_PROPERTY_CHECKS_
// Clean up names and values
for ( index = list->count - 1; index >= 0; index -- )
{
- free( list->name[ index ] );
mlt_property_close( list->value[ index ] );
+ free( list->name[ index ] );
}
+#if defined(__linux__) || defined(__DARWIN__)
+ // Cleanup locale
+ if ( list->locale )
+ freelocale( list->locale );
+#endif
+
// Clear up the list
pthread_mutex_destroy( &list->mutex );
free( list->name );
free( list->value );
free( list );
- // Free this now if this has no child
- if ( this->child == NULL )
- free( this );
+ // Free self now if self has no child
+ if ( self->child == NULL )
+ free( self );
}
}
}
if ( strcmp( ptr, "" ) == 0 )
{
mlt_properties child = mlt_properties_new();
+ mlt_properties_set_lcnumeric( child, mlt_properties_get_lcnumeric( properties ) );
mlt_properties_set_data( properties, name, child, 0,
( mlt_destructor )mlt_properties_close, NULL );
mlt_deque_push_front( context->stack, child );
mlt_properties child = mlt_properties_new();
char key[20];
+ mlt_properties_set_lcnumeric( child, mlt_properties_get_lcnumeric( properties ) );
snprintf( key, sizeof(key), "%d", context->index++ );
mlt_properties_set_data( properties, key, child, 0,
( mlt_destructor )mlt_properties_close, NULL );
error = mlt_properties_set( properties, name, value );
+ if ( !strcmp( name, "LC_NUMERIC" ) )
+ mlt_properties_set_lcnumeric( properties, value );
+
free( name_ );
free( value );
mlt_properties mlt_properties_parse_yaml( const char *filename )
{
// Construct a standalone properties object
- mlt_properties this = mlt_properties_new( );
+ mlt_properties self = mlt_properties_new( );
- if ( this )
+ if ( self )
{
// Open the file
FILE *file = fopen( filename, "r" );
char temp[ 1024 ];
char *ptemp = &temp[ 0 ];
+ // Default to LC_NUMERIC = C
+ mlt_properties_set_lcnumeric( self, "C" );
+
// Parser context
yaml_parser context = calloc( 1, sizeof( struct yaml_parser_context ) );
context->stack = mlt_deque_init();
- mlt_deque_push_front( context->stack, this );
+ mlt_deque_push_front( context->stack, self );
// Read each string from the file
while( fgets( temp, 1024, file ) )
}
// Return the pointer
- return this;
+ return self;
}
/*
/** Recursively serialize a properties list into a string buffer as YAML Tiny.
*
* \private \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \param output a string buffer to hold the serialized YAML Tiny
* \param indent the number of spaces to indent (for recursion, initialize to 0)
- * \param is_parent_sequence Is 'this' properties list really just a sequence (for recursion, initialize to 0)?
+ * \param is_parent_sequence Is this properties list really just a sequence (for recursion, initialize to 0)?
*/
-static void serialise_yaml( mlt_properties this, strbuf output, int indent, int is_parent_sequence )
+static void serialise_yaml( mlt_properties self, strbuf output, int indent, int is_parent_sequence )
{
- property_list *list = this->local;
+ property_list *list = self->local;
int i = 0;
for ( i = 0; i < list->count; i ++ )
// Unfortunately, we do not have run time type identification.
mlt_properties child = mlt_property_get_data( list->value[ i ], NULL );
- if ( mlt_properties_is_sequence( this ) )
+ if ( mlt_properties_is_sequence( self ) )
{
// Ignore hidden/non-serialisable items
if ( list->name[ i ][ 0 ] != '_' )
strbuf_printf( output, "- " );
// If the value can be represented as a string
- const char *value = mlt_properties_get( this, list->name[ i ] );
+ const char *value = mlt_properties_get( self, list->name[ i ] );
if ( value && strcmp( value, "" ) )
{
// Determine if this is an unfolded block literal
else
{
// Assume this is a normal map-oriented properties list
- const char *value = mlt_properties_get( this, list->name[ i ] );
+ const char *value = mlt_properties_get( self, list->name[ i ] );
// Ignore hidden/non-serialisable items
// If the value can be represented as a string
* This operates on properties containing properties as a hierarchical data
* structure.
* \public \memberof mlt_properties_s
- * \param this a properties list
+ * \param self a properties list
* \return a string containing YAML Tiny that represents the properties list
*/
-char *mlt_properties_serialise_yaml( mlt_properties this )
+char *mlt_properties_serialise_yaml( mlt_properties self )
{
+ const char *lc_numeric = mlt_properties_get_lcnumeric( self );
strbuf b = strbuf_new();
strbuf_printf( b, "---\n" );
- serialise_yaml( this, b, 0, 0 );
+ mlt_properties_set_lcnumeric( self, "C" );
+ serialise_yaml( self, b, 0, 0 );
+ mlt_properties_set_lcnumeric( self, lc_numeric );
strbuf_printf( b, "...\n" );
char *ret = b->string;
strbuf_close( b );
return ret;
}
+
+/** Protect a properties list against concurrent access.
+ *
+ * \public \memberof mlt_properties_s
+ * \param self a properties list
+ */
+
+void mlt_properties_lock( mlt_properties self )
+{
+ if ( self )
+ pthread_mutex_lock( &( ( property_list* )( self->local ) )->mutex );
+}
+
+/** End protecting a properties list against concurrent access.
+ *
+ * \public \memberof mlt_properties_s
+ * \param self a properties list
+ */
+
+void mlt_properties_unlock( mlt_properties self )
+{
+ if ( self )
+ pthread_mutex_unlock( &( ( property_list* )( self->local ) )->mutex );
+}