vorbis producer added, clean up on clip handling in multitrack

[mlt] / src / modules / inigo / producer_inigo.c

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index efe2d766ed13661d29e917f9605188dea04d9414..313e8d59782e3e5ac4f89475d04fbde61908e22f 100644 (file)
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -44,12 +44,13 @@ static mlt_producer parse_inigo( char *file )
        }
 
        mlt_producer result = producer_inigo_init( args );
+
        if ( result != NULL )
        {
                mlt_properties properties = mlt_producer_properties( result );
-               mlt_field field = mlt_properties_get_data( properties, "field", NULL );
+               fprintf( stderr, "resource = %s\n", mlt_properties_get( properties, "resource" ) );
                mlt_properties_set( properties, "resource", file );
-               mlt_properties_set( mlt_field_properties( field ), "resource", file );
+               fprintf( stderr, "resource = %s\n", mlt_properties_get( properties, "resource" ) );
        }
 
        while( count -- )
@@ -84,6 +85,10 @@ static mlt_producer create_producer( char *file )
                result = mlt_factory_producer( "pixbuf", file );
        else if ( strstr( file, ".txt" ) )
                result = mlt_factory_producer( "pango", file );
+       else if ( strstr( file, ".westley" ) )
+               result = mlt_factory_producer( "westley", file );
+       else if ( strstr( file, ".ogg" ) )
+               result = mlt_factory_producer( "vorbis", file );
 
        // 2nd Line fallbacks
        if ( result == NULL && strstr( file, ".dv" ) )
@@ -92,6 +97,10 @@ static mlt_producer create_producer( char *file )
                result = mlt_factory_producer( "libdv", file );
 
        // 3rd line fallbacks 
+       if ( result == NULL )
+               result = mlt_factory_producer( "avformat", file );
+
+       // 4th line fallbacks 
        if ( result == NULL )
                result = mlt_factory_producer( "ffmpeg", file );
 
@@ -135,11 +144,6 @@ static mlt_transition create_transition( mlt_field field, char *id, int track )
        return transition;
 }
 
-static void set_properties( mlt_properties properties, char *namevalue )
-{
-       mlt_properties_parse( properties, namevalue );
-}
-
 mlt_producer producer_inigo_init( char **argv )
 {
        int i;
@@ -203,7 +207,7 @@ mlt_producer producer_inigo_init( char **argv )
                }
                else if ( strstr( argv[ i ], "=" ) )
                {
-                       set_properties( properties, argv[ i ] );
+                       mlt_properties_parse( properties, argv[ i ] );
                }
                else if ( argv[ i ][ 0 ] != '-' )
                {
@@ -219,11 +223,14 @@ mlt_producer producer_inigo_init( char **argv )
                else
                {
                        if ( !strcmp( argv[ i ], "-serialise" ) )
-                               i ++;
+                               i += 2;
                        else if ( !strcmp( argv[ i ], "-consumer" ) )
+                               i += 2;
+
+                       while ( argv[ i ] != NULL && strchr( argv[ i ], '=' ) )
                                i ++;
-                       else while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
-                               i ++;
+
+                       i --;
                }
        }
 
@@ -238,10 +245,16 @@ mlt_producer producer_inigo_init( char **argv )
                mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), track );
        }
 
-       mlt_properties props = mlt_multitrack_properties( multitrack );
+       mlt_tractor tractor = mlt_field_tractor( field );
+       mlt_producer prod = mlt_tractor_producer( tractor );
+       mlt_properties props = mlt_tractor_properties( tractor );
+       mlt_properties_set_data( props, "multitrack", multitrack, 0, NULL, NULL );
        mlt_properties_set_data( props, "field", field, 0, NULL, NULL );
        mlt_properties_set_data( props, "group", group, 0, NULL, NULL );
+       mlt_properties_set_position( props, "length", mlt_producer_get_out( mlt_multitrack_producer( multitrack ) ) + 1 );
+       mlt_producer_set_in_and_out( prod, 0, mlt_producer_get_out( mlt_multitrack_producer( multitrack ) ) );
+       mlt_properties_set_double( props, "fps", mlt_producer_get_fps( mlt_multitrack_producer( multitrack ) ) );
 
-       return mlt_multitrack_producer( multitrack );
+       return mlt_tractor_producer( tractor );
 }