X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=147c45d43b7ab5bfbff4ca0d60fe449265ba4fe2;hb=2ec3359e476bc73d56e09fb597e1a424f2d1708d;hp=6c02230f2548e5a9d4cf79ae141f3086ba0b112e;hpb=7c518e80321a87a22d2e48835442c9f5b70dcd17;p=melted

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 6c02230..147c45d 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -55,6 +55,7 @@ mlt_tractor mlt_tractor_init( )
 		if ( mlt_producer_init( producer, this ) == 0 )
 		{
 			producer->get_frame = producer_get_frame;
+			mlt_properties_set( mlt_producer_properties( producer ), "resource", "<tractor>" );
 		}
 		else
 		{
@@ -118,7 +119,9 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 		int i = 0;
 		int looking = 1;
 		int done = 0;
-		mlt_frame temp;
+		mlt_frame temp = NULL;
+		mlt_frame store[ 10 ];
+		int count = 0;
 
 		// Get the properties of the parent producer
 		mlt_properties properties = mlt_producer_properties( parent );
@@ -132,7 +135,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 			mlt_producer target = mlt_multitrack_producer( multitrack );
 			mlt_producer_seek( target, mlt_producer_frame( parent ) );
 			mlt_producer_set_speed( target, mlt_producer_get_speed( parent ) );
-			mlt_producer_set_in_and_out( parent, mlt_producer_get_in( target ), mlt_producer_get_out( target ) );
+			//mlt_producer_set_in_and_out( parent, mlt_producer_get_in( target ), mlt_producer_get_out( target ) );
 		}
 		else
 		{
@@ -154,19 +157,28 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 				// Use this as output if we don't have one already
 				*frame = temp;
 			}
-			else if ( !mlt_frame_is_test_card( temp ) && looking )
+			else if ( ( !mlt_frame_is_test_card( temp ) || !mlt_frame_is_test_audio( temp ) ) && looking &&
+					    mlt_producer_frame( parent ) == mlt_frame_get_position( temp ) )
 			{
-				// This is the one we want and we can stop looking
 				*frame = temp;
 				looking = 0;
 			}
 			else
 			{
-				// We discard all other frames
-				mlt_frame_close( temp );
+				// We store all other frames for now
+				store[ count ++ ] = temp;
 			}
 		}
 
+		// Now place all the unused frames on to the properties (will be destroyed automatically)
+		while ( count -- )
+		{
+			mlt_properties frame_properties = mlt_frame_properties( *frame );
+			char label[ 30 ];
+			sprintf( label, "tractor_%d", count );
+			mlt_properties_set_data( frame_properties, label, store[ count ], 0, ( mlt_destructor )mlt_frame_close, NULL );
+		}
+
 		// Prepare the next frame
 		mlt_producer_prepare_next( parent );