X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=1bbcace77b411d2bbfe1cad90feff5c0105bc789;hb=c63b98c399b13d0672beb9cabba832a71d45a2ea;hp=8d6247d40d1ca2c76ee1f33586bb0c104d3444a2;hpb=6336039a203c6496691784682f9ad56eb13abcc3;p=melted

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 8d6247d..1bbcace 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 /** Private structure.
 */
@@ -55,6 +56,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
 		{
@@ -119,6 +121,8 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 		int looking = 1;
 		int done = 0;
 		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 +136,6 @@ 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 ) );
 		}
 		else
 		{
@@ -154,25 +157,30 @@ 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 ) || !mlt_frame_is_test_audio( temp ) ) && 
-					    mlt_producer_frame( parent ) == mlt_properties_get_position( mlt_frame_properties( temp ), "position" ) )
+			else if ( ( !mlt_frame_is_test_card( temp ) || !mlt_frame_is_test_audio( temp ) ) && looking &&
+					    mlt_producer_frame( parent ) == mlt_frame_get_position( temp ) )
 			{
 				*frame = temp;
 				looking = 0;
 			}
-			else if ( ( !mlt_frame_is_test_card( temp ) || !mlt_frame_is_test_audio( temp ) ) && looking )
-			{
-				// 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 );
+			while ( mlt_properties_get_data( frame_properties, label, NULL ) != NULL )
+				strcat( label, "+" );
+			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 );