Finalisation of first phase of cut handling (unmanaged)

[melted] / src / framework / mlt_transition.c

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 12443d7..21ccfda 100644 (file)
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -45,6 +45,8 @@ 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 );
@@ -72,7 +74,7 @@ mlt_transition mlt_transition_new( )
 
 mlt_service mlt_transition_service( mlt_transition this )
 {
-       return &this->parent;
+       return this != NULL ? &this->parent : NULL;
 }
 
 /** Get the properties interface.
@@ -195,8 +197,30 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
                mlt_position position = mlt_frame_get_position( this->a_frame );
                if ( position >= in && position <= out )
                {
-                       // Process the transition
-                       *frame = mlt_transition_process( this, this->a_frame, this->b_frame );
+#if 0
+                       // TODO: This could is breaking muliple transitions, but it would be nice to have...
+                       // essentially, it allows transitions to run over whole tracks, while ignoring test cards
+                       // (alternative is to put the handling in the transitions themselves :-/)
+                       if ( this->b_frame == NULL || ( mlt_frame_is_test_card( this->b_frame ) && mlt_frame_is_test_audio( this->b_frame ) ) )
+                       {
+                               *frame = this->a_frame;
+                       }
+                       else if ( this->a_frame == NULL || ( mlt_frame_is_test_card( this->a_frame ) && mlt_frame_is_test_audio( this->a_frame ) ) )
+                       {
+                               mlt_frame t = this->a_frame;
+                               this->a_frame = this->b_frame;
+                               this->b_frame = t;
+                               *frame = this->a_frame;
+                       }
+                       else
+#endif
+                       {
+                               *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
@@ -226,8 +250,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 );
+       }
 }