X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_property.c;h=d057f0ce98351acfb5b673227a940d946a7f7d6c;hb=63dc2f08b9ec162234aa8d6688bf56ec71349acb;hp=f3613ce20cca713908d71e0133102bdbf55783b9;hpb=23c2a612605501afef9f5c9029145958e6c7fbd8;p=melted

diff --git a/src/framework/mlt_property.c b/src/framework/mlt_property.c
index f3613ce..d057f0c 100644
--- a/src/framework/mlt_property.c
+++ b/src/framework/mlt_property.c
@@ -110,13 +110,20 @@ int mlt_property_set_position( mlt_property this, mlt_position value )
 /** Set a string on this property.
 */
 
-int mlt_property_set_string( mlt_property this, char *value )
+int mlt_property_set_string( mlt_property this, const char *value )
 {
-	mlt_property_clear( this );
-	this->types = mlt_prop_string;
-	if ( value != NULL )
-		this->prop_string = strdup( value );
-	return this->prop_string != NULL;
+	if ( value != this->prop_string )
+	{
+		mlt_property_clear( this );
+		this->types = mlt_prop_string;
+		if ( value != NULL )
+			this->prop_string = strdup( value );
+	}
+	else
+	{
+		this->types = mlt_prop_string;
+	}
+	return this->prop_string == NULL;
 }
 
 /** Set an int64 on this property.
@@ -146,6 +153,16 @@ int mlt_property_set_data( mlt_property this, void *value, int length, mlt_destr
 	return 0;
 }
 
+static inline int mlt_property_atoi( const char *value )
+{
+	if ( value == NULL )
+		return 0;
+	else if ( value[0] == '0' && value[1] == 'x' )
+		return strtol( value + 2, NULL, 16 );
+	else 
+		return strtol( value, NULL, 10 );
+}
+
 /** Get an int from this property.
 */
 
@@ -160,7 +177,7 @@ int mlt_property_get_int( mlt_property this )
 	else if ( this->types & mlt_prop_int64 )
 		return ( int )this->prop_int64;
 	else if ( this->types & mlt_prop_string )
-		return atoi( this->prop_string );
+		return mlt_property_atoi( this->prop_string );
 	return 0;
 }
 
@@ -200,6 +217,16 @@ mlt_position mlt_property_get_position( mlt_property this )
 	return 0;
 }
 
+static inline int64_t mlt_property_atoll( const char *value )
+{
+	if ( value == NULL )
+		return 0;
+	else if ( value[0] == '0' && value[1] == 'x' )
+		return strtoll( value + 2, NULL, 16 );
+	else 
+		return strtoll( value, NULL, 10 );
+}
+
 /** Get an int64 from this property.
 */
 
@@ -214,7 +241,7 @@ int64_t mlt_property_get_int64( mlt_property this )
 	else if ( this->types & mlt_prop_position )
 		return ( int64_t )this->prop_position;
 	else if ( this->types & mlt_prop_string )
-		return ( int64_t )atol( this->prop_string );
+		return mlt_property_atoll( this->prop_string );
 	return 0;
 }
 
@@ -236,13 +263,13 @@ char *mlt_property_get_string( mlt_property this )
 		{
 			this->types |= mlt_prop_string;
 			this->prop_string = malloc( 32 );
-			sprintf( this->prop_string, "%e", this->prop_double );
+			sprintf( this->prop_string, "%f", this->prop_double );
 		}
 		else if ( this->types & mlt_prop_position )
 		{
 			this->types |= mlt_prop_string;
 			this->prop_string = malloc( 32 );
-			sprintf( this->prop_string, "%d", this->prop_position );
+			sprintf( this->prop_string, "%d", (int)this->prop_position ); /* I don't know if this is wanted. -Zach */
 		}
 		else if ( this->types & mlt_prop_int64 )
 		{
@@ -283,4 +310,31 @@ void mlt_property_close( mlt_property this )
 	free( this );
 }
 
+/** Pass the property 'that' to 'this'.
+* Who to blame: Zach <zachary.drew@gmail.com>
+*/
+void mlt_property_pass( mlt_property this, mlt_property that )
+{
+	mlt_property_clear( this );
+
+	this->types = that->types;
 
+	if ( this->types & mlt_prop_int64 )
+		this->prop_int64 = that->prop_int64;
+	else if ( this->types & mlt_prop_int )
+		this->prop_int = that->prop_int;
+	else if ( this->types & mlt_prop_double )
+		this->prop_double = that->prop_double;
+	else if ( this->types & mlt_prop_position )
+		this->prop_position = that->prop_position;
+	else if ( this->types & mlt_prop_string )
+	{
+		if ( that->prop_string != NULL )
+			this->prop_string = strdup( that->prop_string );
+	}
+	else if ( this->types & mlt_prop_data && this->serialiser != NULL )
+	{
+		this->types = mlt_prop_string;
+		this->prop_string = this->serialiser( this->data, this->length );	
+	}
+}