X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.c;h=e1e6453968bec63d35eab80b139410897fd62efa;hb=0f6ab868f4253de21c81a9ba5a83efa598974ced;hp=679d97ad06f701ad8471478f01891b9ca581bd9f;hpb=26748780198a5760af65208e8c2a87581ef362cd;p=melted

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index 679d97a..e1e6453 100644
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -72,6 +72,33 @@ mlt_properties mlt_properties_new( )
 	return this;
 }
 
+/** Special case - when a container (such as fezzik) is protecting another 
+	producer, we need to ensure that properties are passed through to the
+	real producer.
+*/
+
+static void mlt_properties_do_mirror( mlt_properties this, char *name )
+{
+	if ( strcmp( name, "in" ) && strcmp( name, "out" ) )
+	{
+		mlt_properties mirror = mlt_properties_get_data( this, "mlt_mirror", NULL );
+		if ( mirror != NULL )
+		{
+			char *value = mlt_properties_get( this, name );
+			if ( value != NULL )
+				mlt_properties_set( mirror, name, value );
+		}
+	}
+}
+
+/** Allow the specification of a mirror.
+*/
+
+void mlt_properties_mirror( mlt_properties this, mlt_properties that )
+{
+	mlt_properties_set_data( this, "mlt_mirror", that, 0, NULL, NULL );
+}
+
 /** Inherit all serialisable properties from that into this.
 */
 
@@ -158,7 +185,10 @@ int mlt_properties_set( mlt_properties this, char *name, char *value )
 
 	// Set it if not NULL
 	if ( property != NULL )
+	{
 		error = mlt_property_set_string( property, value );
+		mlt_properties_do_mirror( this, name );
+	}
 
 	return error;
 }
@@ -251,7 +281,10 @@ int mlt_properties_set_int( mlt_properties this, char *name, int value )
 
 	// Set it if not NULL
 	if ( property != NULL )
+	{
 		error = mlt_property_set_int( property, value );
+		mlt_properties_do_mirror( this, name );
+	}
 
 	return error;
 }
@@ -277,7 +310,10 @@ int mlt_properties_set_double( mlt_properties this, char *name, double value )
 
 	// Set it if not NULL
 	if ( property != NULL )
+	{
 		error = mlt_property_set_double( property, value );
+		mlt_properties_do_mirror( this, name );
+	}
 
 	return error;
 }
@@ -285,16 +321,16 @@ int mlt_properties_set_double( mlt_properties this, char *name, double value )
 /** Get a value associated to the name.
 */
 
-mlt_timecode mlt_properties_get_timecode( mlt_properties this, char *name )
+mlt_position mlt_properties_get_position( mlt_properties this, char *name )
 {
 	mlt_property value = mlt_properties_find( this, name );
-	return value == NULL ? 0 : mlt_property_get_timecode( value );
+	return value == NULL ? 0 : mlt_property_get_position( value );
 }
 
 /** Set a value associated to the name.
 */
 
-int mlt_properties_set_timecode( mlt_properties this, char *name, mlt_timecode value )
+int mlt_properties_set_position( mlt_properties this, char *name, mlt_position value )
 {
 	int error = 1;
 
@@ -303,7 +339,10 @@ int mlt_properties_set_timecode( mlt_properties this, char *name, mlt_timecode v
 
 	// Set it if not NULL
 	if ( property != NULL )
-		error = mlt_property_set_timecode( property, value );
+	{
+		error = mlt_property_set_position( property, value );
+		mlt_properties_do_mirror( this, name );
+	}
 
 	return error;
 }
@@ -334,6 +373,44 @@ int mlt_properties_set_data( mlt_properties this, char *name, void *value, int l
 	return error;
 }
 
+/** Rename a property.
+*/
+
+int mlt_properties_rename( mlt_properties this, char *source, char *dest )
+{
+	mlt_property value = mlt_properties_find( this, dest );
+
+	if ( value == NULL )
+	{
+		property_list *list = this->private;
+		int i = 0;
+
+		// Locate the item 
+		for ( i = 0; i < list->count; i ++ )
+		{
+			if ( !strcmp( list->name[ i ], source ) )
+			{
+				free( list->name[ i ] );
+				list->name[ i ] = strdup( dest );
+				break;
+			}
+		}
+	}
+
+	return value != NULL;
+}
+
+/** Dump the properties.
+*/
+
+void mlt_properties_dump( mlt_properties this, FILE *output )
+{
+	property_list *list = this->private;
+	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 ] ) );
+}
+
 /** Close the list.
 */
 
@@ -342,13 +419,9 @@ void mlt_properties_close( mlt_properties this )
 	property_list *list = this->private;
 	int index = 0;
 
-	int debug = mlt_properties_get_int( this, "debug" );
-
 	// Clean up names and values
-	for ( index = 0; index < list->count; index ++ )
+	for ( index = list->count - 1; index >= 0; index -- )
 	{
-		if ( debug )
-			fprintf( stderr, "closing %s\n", list->name[ index ] );
 		free( list->name[ index ] );
 		mlt_property_close( list->value[ index ] );
 	}