xml based westley serialisation

[melted] / src / framework / mlt_tractor.c

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 8d6247d..f68079a 100644 (file)
--- 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,9 @@ 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>" );
+                       mlt_properties_set( mlt_producer_properties( producer ), "mlt_type", "mlt_producer" );
+                       mlt_properties_set( mlt_producer_properties( producer ), "mlt_service", "tractor" );
                }
                else
                {
@@ -119,6 +123,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 +138,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 +159,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 );