X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=9fd2025ed78a25baaeead3c2958de01c12070163;hb=206ff6b48bd54bee6d1ac679c352296f374c7590;hp=ab2c206fc70bb7a08bd8047b887efcef8c3bd91d;hpb=4a39b72c5ac8fd2dd6db81a95eab08adde0491b9;p=melted

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index ab2c206..9fd2025 100644
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -47,7 +47,7 @@ property_list;
 /** Memory leak checks.
 */
 
-//#define _MLT_PROPERTY_CHECKS_
+//#define _MLT_PROPERTY_CHECKS_ 2
 
 #ifdef _MLT_PROPERTY_CHECKS_
 static int properties_created = 0;
@@ -101,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( );
@@ -116,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 ) )
@@ -123,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 );
@@ -137,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;
@@ -151,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 ) 
@@ -188,7 +202,20 @@ int mlt_properties_dec_ref( mlt_properties this )
 	return 0;
 }
 
-/** Allow the specification of a mirror.
+/** 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 )
@@ -219,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 );
@@ -237,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;
@@ -267,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 );
@@ -276,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 ) );
 	}
 
@@ -295,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 );
@@ -308,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;
 
@@ -319,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;
@@ -381,7 +464,7 @@ int mlt_properties_set( mlt_properties this, char *name, char *value )
 /** 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 );
 }
@@ -389,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 );
@@ -440,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;
@@ -479,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 );
@@ -488,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;
 
@@ -510,7 +593,38 @@ int mlt_properties_set_int( mlt_properties this, char *name, int value )
 /** 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 );
@@ -519,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;
 
@@ -541,7 +655,7 @@ int mlt_properties_set_double( mlt_properties this, char *name, double value )
 /** 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 );
@@ -550,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;
 
@@ -572,7 +686,7 @@ int mlt_properties_set_position( mlt_properties this, char *name, mlt_position v
 /** 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 );
@@ -581,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;
 
@@ -600,7 +714,7 @@ int mlt_properties_set_data( mlt_properties this, char *name, void *value, int l
 /** 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 );
 
@@ -637,9 +751,9 @@ 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 )
+void mlt_properties_debug( mlt_properties this, const char *title, FILE *output )
 {
-	fprintf( stderr, "%s: ", title );
+	fprintf( output, "%s: ", title );
 	if ( this != NULL )
 	{
 		property_list *list = this->local;
@@ -652,7 +766,7 @@ void mlt_properties_debug( mlt_properties this, char *title, FILE *output )
 				fprintf( output, ", %s=%p", list->name[ i ], mlt_properties_get_data( this, list->name[ i ], NULL ) );
 		fprintf( output, " ]" );
 	}
-	fprintf( stderr, "\n" );
+	fprintf( output, "\n" );
 }
 
 /** Close the list.
@@ -671,10 +785,12 @@ void mlt_properties_close( mlt_properties this )
 			property_list *list = this->local;
 			int index = 0;
 
-#ifdef _MLT_PROPERTY_CHECKS_
+#if _MLT_PROPERTY_CHECKS_ == 1
 			// Show debug info
 			mlt_properties_debug( this, "Closing", stderr );
+#endif
 
+#ifdef _MLT_PROPERTY_CHECKS_
 			// Increment destroyed count
 			properties_destroyed ++;