X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=3bcf020166ec2028b121856006c5430238e3ca56;hb=448668c0ab64f692e5ab0bd2af8fe35892ef48e5;hp=8de038be735459d537cdc92493a1e3f3137a26ba;hpb=9029c77b04ddf9c9d9becacca56615607bb84234;p=melted

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 8de038b..3bcf020 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 /** Forward references to static methods.
 */
@@ -252,6 +253,8 @@ static void destroy_data_queue( void *arg )
 }
 
 /** Get the next frame.
+
+	TODO: This function needs to be redesigned...
 */
 
 static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int track )
@@ -326,21 +329,45 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 				// Handle fx only tracks
 				if ( mlt_properties_get_int( temp_properties, "meta.fx_cut" ) )
 				{
-					// Take all but the first placeholding producer and dump on to the image stack
+					mlt_properties copy = video == NULL ? frame_properties : MLT_FRAME_PROPERTIES( video );
+					int i = 0;
+
+					for ( i = 0; i < mlt_properties_count( temp_properties ); i ++ )
+					{
+						char *name = mlt_properties_get_name( temp_properties, i );
+						char *value = mlt_properties_get_value( temp_properties, i );
+						// For animated filters
+						if ( isdigit( name[ 0 ] ) && value != NULL )
+							mlt_properties_set( copy, name, value );
+					}
+
 					if ( video )
 					{
+						// Take all but the first placeholding producer and dump on to the image stack
 						void *p = mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( temp ) );
 						while ( ( p = mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( temp ) ) ) != NULL )
 							mlt_deque_push_back( MLT_FRAME_IMAGE_STACK( video ), p );
 					}
+					else
+					{
+						mlt_frame_push_service( *frame, temp );
+						mlt_frame_push_service( *frame, producer_get_image );
+						mlt_properties_set_int( frame_properties, "meta.fx_cut", 1 );
+					}
 
-					// Take all but the first placeholding producer and dump on to the audio stack
 					if ( audio )
 					{
-						void *p = mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) );
+						// Take all but the first placeholding producer and dump on to the audio stack
+						void *p = !mlt_frame_is_test_audio( temp ) ? mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) ) : NULL;
 						while ( ( p = mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) ) ) != NULL )
 							mlt_deque_push_back( MLT_FRAME_AUDIO_STACK( audio ), p );
 					}
+					else
+					{
+						mlt_frame_push_audio( *frame, temp );
+						mlt_frame_push_audio( *frame, producer_get_audio );
+						mlt_properties_set_int( frame_properties, "meta.fx_cut", 1 );
+					}
 
 					// Ensure everything is hidden
 					mlt_properties_set_int( temp_properties, "hide", 3 );
@@ -382,9 +409,24 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 
 				// Pick up first video and audio frames
 				if ( !done && !mlt_frame_is_test_audio( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 2 ) )
+				{
+					// Order of frame creation is starting to get problematic
+					if ( audio != NULL )
+					{
+						mlt_deque_push_front( MLT_FRAME_AUDIO_STACK( temp ), producer_get_audio );
+						mlt_deque_push_front( MLT_FRAME_AUDIO_STACK( temp ), audio );
+					}
 					audio = temp;
+				}
 				if ( !done && !mlt_frame_is_test_card( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 1 ) )
+				{
+					if ( video != NULL )
+					{
+						mlt_deque_push_front( MLT_FRAME_IMAGE_STACK( temp ), producer_get_image );
+						mlt_deque_push_front( MLT_FRAME_IMAGE_STACK( temp ), video );
+					}
 					video = temp;
+				}
 			}
 	
 			// Now stack callbacks