Mlt Ref Counts and Playlist split/join

[mlt] / src / framework / mlt_transition.c

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 9eb0c46d9df571e7dc24035d359df2ec82af41b3..13957752d2c39a5a1c428e0be31fa94f76c4b5fc 100644 (file)
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -45,24 +45,36 @@ int mlt_transition_init( mlt_transition this, void *child )
                mlt_properties properties = mlt_transition_properties( this );
 
                service->get_frame = transition_get_frame;
+               service->close = ( mlt_destructor )mlt_transition_close;
+               service->close_object = this;
 
                mlt_properties_set_position( properties, "in", 0 );
                mlt_properties_set_position( properties, "out", 0 );
                mlt_properties_set_int( properties, "a_track", 0 );
                mlt_properties_set_int( properties, "b_track", 1 );
-               mlt_properties_set( properties, "resource", "<transition>" );
 
                return 0;
        }
        return 1;
 }
 
+/** Create a new transition.
+*/
+
+mlt_transition mlt_transition_new( )
+{
+       mlt_transition this = calloc( 1, sizeof( struct mlt_transition_s ) );
+       if ( this != NULL )
+               mlt_transition_init( this, NULL );
+       return this;
+}
+
 /** Get the service associated to the transition.
 */
 
 mlt_service mlt_transition_service( mlt_transition this )
 {
-       return &this->parent;
+       return this != NULL ? &this->parent : NULL;
 }
 
 /** Get the properties interface.
@@ -136,7 +148,7 @@ mlt_position mlt_transition_get_out( mlt_transition this )
        If we have no process method (unlikely), we simply return the a_frame unmolested.
 */
 
-static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame )
+mlt_frame mlt_transition_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame )
 {
        if ( this->process == NULL )
                return a_frame;
@@ -170,7 +182,6 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
        mlt_position in = mlt_properties_get_position( properties, "in" );
        mlt_position out = mlt_properties_get_position( properties, "out" );
 
-       // Fetch a and b frames together...
        if ( ( index == a_track || index == b_track ) && !( this->a_held || this->b_held ) )
        {
                mlt_service_get_frame( this->producer, &this->a_frame, a_track );
@@ -187,7 +198,11 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
                if ( position >= in && position <= out )
                {
                        // Process the transition
-                       *frame = transition_process( this, this->a_frame, this->b_frame );
+                       *frame = mlt_transition_process( this, this->a_frame, this->b_frame );
+                       if ( !mlt_properties_get_int( mlt_frame_properties( this->a_frame ), "test_image" ) )
+                               mlt_properties_set_int( mlt_frame_properties( this->b_frame ), "test_image", 1 );
+                       if ( !mlt_properties_get_int( mlt_frame_properties( this->a_frame ), "test_audio" ) )
+                               mlt_properties_set_int( mlt_frame_properties( this->b_frame ), "test_audio", 1 );
                        this->a_held = 0;
                }
                else
@@ -217,8 +232,12 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
 
 void mlt_transition_close( mlt_transition this )
 {
-       if ( this->close != NULL )
-               this->close( this );
-       else
-               mlt_service_close( &this->parent );
+       if ( this != NULL && mlt_properties_dec_ref( mlt_transition_properties( this ) ) <= 0 )
+       {
+               this->parent.close = NULL;
+               if ( this->close != NULL )
+                       this->close( this );
+               else
+                       mlt_service_close( &this->parent );
+       }
 }