Fix build errors caused by the (hypothetical) conversion of mlt_position from an...

[melted] / src / framework / mlt_property.c

diff --git a/src/framework/mlt_property.c b/src/framework/mlt_property.c
index 021dbc1..016ea91 100644 (file)
--- 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,27 +96,45 @@ 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;
 }
 
 /** 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 )
+{
+       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.
+*/
+
+int mlt_property_set_int64( mlt_property this, int64_t value )
 {
        mlt_property_clear( this );
-       this->types = mlt_prop_string;
-       if ( value != NULL )
-               this->prop_string = strdup( value );
-       return this->prop_string != NULL;
+       this->types = mlt_prop_int64;
+       this->prop_int64 = value;
+       return 0;
 }
 
 /** Set a data on this property.
@@ -101,6 +142,8 @@ int mlt_property_set_string( mlt_property this, char *value )
 
 int mlt_property_set_data( mlt_property this, void *value, int length, mlt_destructor destructor, mlt_serialiser serialiser )
 {
+       if ( this->data == value )
+               this->destructor = NULL;
        mlt_property_clear( this );
        this->types = mlt_prop_data;
        this->data = value;
@@ -110,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.
 */
 
@@ -119,10 +172,12 @@ 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 mlt_property_atoi( this->prop_string );
        return 0;
 }
 
@@ -135,26 +190,58 @@ 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;
+}
+
+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.
+*/
+
+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 mlt_property_atoll( this->prop_string );
        return 0;
 }
 
@@ -176,13 +263,19 @@ 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", (int)this->prop_position ); /* I don't know if this is wanted. -Zach */
                }
-               else if ( this->types & mlt_prop_timecode )
+               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 )
                {