Luma and composite fixes

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

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index 707fb774fc7cc51c5aff44c06ade057dfcc9c61e..2a46fed02730db9ec8e8a1e3f31785bef60964d3 100644 (file)
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -79,26 +79,30 @@ static mlt_producer create_producer( mlt_field field, char *file )
 
 static mlt_filter create_attach( mlt_field field, char *id, int track )
 {
-       char *arg = strchr( id, ':' );
+       char *temp = strdup( id );
+       char *arg = strchr( temp, ':' );
        if ( arg != NULL )
                *arg ++ = '\0';
-       mlt_filter filter = mlt_factory_filter( id, arg );
+       mlt_filter filter = mlt_factory_filter( temp, arg );
        if ( filter != NULL )
                track_service( field, filter, ( mlt_destructor )mlt_filter_close );
+       free( temp );
        return filter;
 }
 
 static mlt_filter create_filter( mlt_field field, char *id, int track )
 {
-       char *arg = strchr( id, ':' );
+       char *temp = strdup( id );
+       char *arg = strchr( temp, ':' );
        if ( arg != NULL )
                *arg ++ = '\0';
-       mlt_filter filter = mlt_factory_filter( id, arg );
+       mlt_filter filter = mlt_factory_filter( temp, arg );
        if ( filter != NULL )
        {
                mlt_field_plant_filter( field, filter, track );
                track_service( field, filter, ( mlt_destructor )mlt_filter_close );
        }
+       free( temp );
        return filter;
 }
 
@@ -149,11 +153,12 @@ mlt_producer producer_inigo_init( char **argv )
                }
                else if ( !strcmp( argv[ i ], "-attach" ) || 
                                  !strcmp( argv[ i ], "-attach-cut" ) ||
+                                 !strcmp( argv[ i ], "-attach-track" ) ||
                                  !strcmp( argv[ i ], "-attach-clip" ) )
                {
                        int type = !strcmp( argv[ i ], "-attach" ) ? 0 : 
                                           !strcmp( argv[ i ], "-attach-cut" ) ? 1 : 
-                                          2;
+                                          !strcmp( argv[ i ], "-attach-track" ) ? 2 : 3;
                        mlt_filter filter = create_attach( field, argv[ ++ i ], track );
                        if ( producer != NULL && !mlt_producer_is_cut( producer ) )
                        {
@@ -177,11 +182,19 @@ mlt_producer producer_inigo_init( char **argv )
                                else if ( type == 1 )
                                        mlt_service_attach( ( mlt_service )producer, filter );
                                else if ( type == 2 )
+                                       mlt_service_attach( ( mlt_service )playlist, filter );
+                               else if ( type == 3 )
                                        mlt_service_attach( ( mlt_service )mlt_producer_cut_parent( producer ), filter );
 
                                properties = MLT_FILTER_PROPERTIES( filter );
                                mlt_properties_inherit( properties, group );
                        }
+                       else if ( filter != NULL )
+                       {
+                               mlt_service_attach( ( mlt_service )playlist, filter );
+                               properties = MLT_FILTER_PROPERTIES( filter );
+                               mlt_properties_inherit( properties, group );
+                       }
                }
                else if ( !strcmp( argv[ i ], "-repeat" ) )
                {