field and playlist enhancements, producer pixbuf reorg

[melted] / mlt / src / tests / charlie.c

diff --git a/mlt/src/tests/charlie.c b/mlt/src/tests/charlie.c
index 99fbdbf..f807b5d 100644 (file)
--- a/mlt/src/tests/charlie.c
+++ b/mlt/src/tests/charlie.c
@@ -81,7 +81,6 @@ int main( int argc, char **argv )
        mlt_service  service = NULL;
        mlt_consumer consumer = NULL;
        mlt_multitrack multitrack = NULL;
-       mlt_tractor tractor = NULL;
        mlt_producer producer = NULL;
        mlt_playlist playlist = NULL;
        mlt_field field = NULL;
@@ -91,14 +90,15 @@ int main( int argc, char **argv )
 
        // Set up containers
        playlist = mlt_playlist_init( );
-       multitrack = mlt_multitrack_init( );
-       tractor = mlt_tractor_init( );
 
-       // Field must be connected on construction
-       field = mlt_field_init( mlt_multitrack_service( multitrack ) );
+       // Construct the field
+       field = mlt_field_init( );
        mlt_properties properties = mlt_field_properties( field );
        mlt_properties_set_int( properties, "registered", 0 );
 
+       // Get the multitrack from the field
+       multitrack = mlt_field_multitrack( field );
+
        // Parse the arguments
        for ( i = 1; i < argc; i ++ )
        {
@@ -133,25 +133,21 @@ int main( int argc, char **argv )
                consumer= mlt_factory_consumer( "sdl", NULL );
 
        // Connect producer to playlist
-       mlt_playlist_append( playlist, producer );
+       if ( producer != NULL )
+               mlt_playlist_append( playlist, producer );
 
        // Connect multitrack to producer
        mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), 0 );
 
-       // Connect tractor to field
-       mlt_tractor_connect( tractor, mlt_field_service( field ) );
-
        // Connect consumer to tractor
-       mlt_consumer_connect( consumer, mlt_tractor_service( tractor ) );
+       mlt_consumer_connect( consumer, mlt_field_service( field ) );
 
        // Transport functionality
-       transport( producer );
+       transport( mlt_multitrack_producer( multitrack ) );
 
        // Close the services
        mlt_consumer_close( consumer );
-       mlt_tractor_close( tractor );
        mlt_field_close( field );
-       mlt_multitrack_close( multitrack );
        mlt_producer_close( producer );
 
        // Close the factory