Removal of timecodes, consumer libdv, serialisation of inigo

[melted] / mlt / src / framework / mlt_tractor.c

diff --git a/mlt/src/framework/mlt_tractor.c b/mlt/src/framework/mlt_tractor.c
index f4b77c4..6c02230 100644 (file)
--- a/mlt/src/framework/mlt_tractor.c
+++ b/mlt/src/framework/mlt_tractor.c
@@ -22,6 +22,7 @@
 
 #include "mlt_tractor.h"
 #include "mlt_frame.h"
+#include "mlt_multitrack.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,14 +32,14 @@
 
 struct mlt_tractor_s
 {
-       struct mlt_service_s parent;
+       struct mlt_producer_s parent;
        mlt_service producer;
 };
 
 /** Forward references to static methods.
 */
 
-static int service_get_frame( mlt_service this, mlt_frame_ptr frame, int track );
+static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int track );
 
 /** Constructor for the tractor.
 
@@ -50,10 +51,10 @@ mlt_tractor mlt_tractor_init( )
        mlt_tractor this = calloc( sizeof( struct mlt_tractor_s ), 1 );
        if ( this != NULL )
        {
-               mlt_service service = &this->parent;
-               if ( mlt_service_init( service, this ) == 0 )
+               mlt_producer producer = &this->parent;
+               if ( mlt_producer_init( producer, this ) == 0 )
                {
-                       service->get_frame = service_get_frame;
+                       producer->get_frame = producer_get_frame;
                }
                else
                {
@@ -69,21 +70,35 @@ mlt_tractor mlt_tractor_init( )
 
 mlt_service mlt_tractor_service( mlt_tractor this )
 {
+       return mlt_producer_service( &this->parent );
+}
+
+/** Get the producer object associated to the tractor.
+*/
+
+mlt_producer mlt_tractor_producer( mlt_tractor this )
+{
        return &this->parent;
 }
 
+/** Get the properties object associated to the tractor.
+*/
+
+mlt_properties mlt_tractor_properties( mlt_tractor this )
+{
+       return mlt_producer_properties( &this->parent );
+}
+
 /** Connect the tractor.
 */
 
 int mlt_tractor_connect( mlt_tractor this, mlt_service producer )
 {
-       int ret = mlt_service_connect_producer( &this->parent, producer, 0 );
+       int ret = mlt_service_connect_producer( mlt_tractor_service( this ), producer, 0 );
 
+       // This is the producer we're going to connect to
        if ( ret == 0 )
-       {
-               // This is the producer we're going to connect to
                this->producer = producer;
-       }
 
        return ret;
 }
@@ -93,7 +108,7 @@ int mlt_tractor_connect( mlt_tractor this, mlt_service producer )
        TODO: This should be reading a pump being populated by the thread...
 */
 
-static int service_get_frame( mlt_service parent, mlt_frame_ptr frame, int track )
+static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int track )
 {
        mlt_tractor this = parent->child;
 
@@ -105,6 +120,25 @@ static int service_get_frame( mlt_service parent, mlt_frame_ptr frame, int track
                int done = 0;
                mlt_frame temp;
 
+               // Get the properties of the parent producer
+               mlt_properties properties = mlt_producer_properties( parent );
+
+               // Try to obtain the multitrack associated to the tractor
+               mlt_multitrack multitrack = mlt_properties_get_data( properties, "multitrack", NULL );
+
+               // If we don't have one, we're in trouble... 
+               if ( multitrack != NULL )
+               {
+                       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
+               {
+                       fprintf( stderr, "tractor without a multitrack!!\n" );
+               }
+
                // Loop through each of the tracks we're harvesting
                for ( i = 0; !done; i ++ )
                {
@@ -133,6 +167,9 @@ static int service_get_frame( mlt_service parent, mlt_frame_ptr frame, int track
                        }
                }
 
+               // Prepare the next frame
+               mlt_producer_prepare_next( parent );
+
                // Indicate our found status
                return 0;
        }
@@ -149,7 +186,7 @@ static int service_get_frame( mlt_service parent, mlt_frame_ptr frame, int track
 
 void mlt_tractor_close( mlt_tractor this )
 {
-       mlt_service_close( &this->parent );
+       mlt_producer_close( &this->parent );
        free( this );
 }