X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_transition.c;h=21ccfdabb0b1af38a2178028b550988d5f64e738;hb=9b115c18489fdc84e2198fef65e4e444f579ff24;hp=10d2aeeeeea16ec52eb2f5e2304731c4a21c7488;hpb=42bd0aedb6d3d65bedb98479adcdbaeb326dfee9;p=melted

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 10d2aee..21ccfda 100644
--- 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;
@@ -185,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 = 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
@@ -216,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 );
+	}
 }