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

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 10d2aee..7d4bc41 100644
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -50,13 +50,23 @@ int mlt_transition_init( mlt_transition this, void *child )
 		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.
 */
 
@@ -136,7 +146,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;
@@ -186,7 +196,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