X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_property.c;h=1a458d86df47399769a3d63116551185619f17fd;hb=9ad7cb6cdea367db7a720fa0335f8b8eccf0ae09;hp=22e43c8b38572badf3968207059570f3aef09f09;hpb=eca5634cbdc39a4a6fdc5cee21fc0656525dd898;p=melted

diff --git a/src/framework/mlt_property.c b/src/framework/mlt_property.c
index 22e43c8..1a458d8 100644
--- a/src/framework/mlt_property.c
+++ b/src/framework/mlt_property.c
@@ -31,13 +31,27 @@
 
 mlt_property mlt_property_init( )
 {
-	return calloc( sizeof( struct mlt_property_s ), 1 );
+	mlt_property this = malloc( sizeof( struct mlt_property_s ) );
+	if ( this != NULL )
+	{
+		this->types = 0;
+		this->prop_int = 0;
+		this->prop_position = 0;
+		this->prop_double = 0;
+		this->prop_int64 = 0;
+		this->prop_string = NULL;
+		this->data = NULL;
+		this->length = 0;
+		this->destructor = NULL;
+		this->serialiser = NULL;
+	}
+	return this;
 }
 
 /** Clear a property.
 */
 
-void mlt_property_clear( mlt_property this )
+static inline void mlt_property_clear( mlt_property this )
 {
 	// Special case data handling
 	if ( this->types & mlt_prop_data && this->destructor != NULL )
@@ -47,8 +61,17 @@ void mlt_property_clear( mlt_property this )
 	if ( this->types & mlt_prop_string )
 		free( this->prop_string );
 
-	// We can wipe it now.
-	memset( this, 0, sizeof( struct mlt_property_s ) );
+	// Wipe stuff
+	this->types = 0;
+	this->prop_int = 0;
+	this->prop_position = 0;
+	this->prop_double = 0;
+	this->prop_int64 = 0;
+	this->prop_string = NULL;
+	this->data = NULL;
+	this->length = 0;
+	this->destructor = NULL;
+	this->serialiser = NULL;
 }
 
 /** Set an int on this property.
@@ -73,14 +96,14 @@ int mlt_property_set_double( mlt_property this, double value )
 	return 0;
 }
 
-/** Set a timecode on this property.
+/** Set a position on this property.
 */
 
-int mlt_property_set_timecode( mlt_property this, mlt_timecode value )
+int mlt_property_set_position( mlt_property this, mlt_position value )
 {
 	mlt_property_clear( this );
-	this->types = mlt_prop_timecode;
-	this->prop_timecode = value;
+	this->types = mlt_prop_position;
+	this->prop_position = value;
 	return 0;
 }
 
@@ -93,7 +116,18 @@ int mlt_property_set_string( mlt_property this, char *value )
 	this->types = mlt_prop_string;
 	if ( value != NULL )
 		this->prop_string = strdup( value );
-	return this->prop_string != NULL;
+	return this->prop_string == NULL;
+}
+
+/** Set an int64 on this property.
+*/
+
+int mlt_property_set_int64( mlt_property this, int64_t value )
+{
+	mlt_property_clear( this );
+	this->types = mlt_prop_int64;
+	this->prop_int64 = value;
+	return 0;
 }
 
 /** Set a data on this property.
@@ -121,8 +155,10 @@ int mlt_property_get_int( mlt_property this )
 		return this->prop_int;
 	else if ( this->types & mlt_prop_double )
 		return ( int )this->prop_double;
-	else if ( this->types & mlt_prop_timecode )
-		return ( int )this->prop_timecode;
+	else if ( this->types & mlt_prop_position )
+		return ( int )this->prop_position;
+	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 0;
@@ -137,26 +173,48 @@ double mlt_property_get_double( mlt_property this )
 		return this->prop_double;
 	else if ( this->types & mlt_prop_int )
 		return ( double )this->prop_int;
-	else if ( this->types & mlt_prop_timecode )
-		return ( double )this->prop_timecode;
+	else if ( this->types & mlt_prop_position )
+		return ( double )this->prop_position;
+	else if ( this->types & mlt_prop_int64 )
+		return ( double )this->prop_int64;
 	else if ( this->types & mlt_prop_string )
 		return atof( this->prop_string );
 	return 0;
 }
 
-/** Get a timecode from this property.
+/** Get a position from this property.
 */
 
-mlt_timecode mlt_property_get_timecode( mlt_property this )
+mlt_position mlt_property_get_position( mlt_property this )
 {
-	if ( this->types & mlt_prop_timecode )
-		return this->prop_timecode;
+	if ( this->types & mlt_prop_position )
+		return this->prop_position;
 	else if ( this->types & mlt_prop_int )
-		return ( mlt_timecode )this->prop_int;
+		return ( mlt_position )this->prop_int;
 	else if ( this->types & mlt_prop_double )
-		return ( mlt_timecode )this->prop_double;
+		return ( mlt_position )this->prop_double;
+	else if ( this->types & mlt_prop_int64 )
+		return ( mlt_position )this->prop_int64;
 	else if ( this->types & mlt_prop_string )
-		return ( mlt_timecode )atof( this->prop_string );
+		return ( mlt_position )atol( this->prop_string );
+	return 0;
+}
+
+/** Get an int64 from this property.
+*/
+
+int64_t mlt_property_get_int64( mlt_property this )
+{
+	if ( this->types & mlt_prop_int64 )
+		return this->prop_int64;
+	else if ( this->types & mlt_prop_int )
+		return ( int64_t )this->prop_int;
+	else if ( this->types & mlt_prop_double )
+		return ( int64_t )this->prop_double;
+	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 0;
 }
 
@@ -180,11 +238,17 @@ char *mlt_property_get_string( mlt_property this )
 			this->prop_string = malloc( 32 );
 			sprintf( this->prop_string, "%e", this->prop_double );
 		}
-		else if ( this->types & mlt_prop_timecode )
+		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 );
+		}
+		else if ( this->types & mlt_prop_int64 )
 		{
 			this->types |= mlt_prop_string;
 			this->prop_string = malloc( 32 );
-			sprintf( this->prop_string, "%e", this->prop_timecode );
+			sprintf( this->prop_string, "%lld", this->prop_int64 );
 		}
 		else if ( this->types & mlt_prop_data && this->serialiser != NULL )
 		{