Ensure join inherits all attached filters; inigo can attach to producer or previous...

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

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index 593cc19..2bb3ccf 100644 (file)
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -147,13 +147,26 @@ mlt_producer producer_inigo_init( char **argv )
                        if ( group != NULL )
                                properties = group;
                }
-               else if ( !strcmp( argv[ i ], "-attach" ) )
+               else if ( !strcmp( argv[ i ], "-attach" ) || !strcmp( argv[ i ], "-chain" ) )
                {
+                       int type = !strcmp( argv[ i ], "-attach" ) ? 0 : 1;
                        mlt_filter filter = create_attach( field, argv[ ++ i ], track );
-                       if ( filter != NULL )
+                       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+                       {
+                               mlt_playlist_clip_info info;
+                               mlt_playlist_append( playlist, producer );
+                               mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+                               producer = info.cut;
+                               properties = mlt_producer_properties( producer );
+                       }
+
+                       if ( filter != NULL && mlt_playlist_count( playlist ) > 0 )
                        {
-                               if ( properties != NULL )
+                               if ( type == 0 )
                                        mlt_service_attach( ( mlt_service )properties, filter );
+                               else
+                                       mlt_service_attach( ( mlt_service )producer, filter );
+
                                properties = mlt_filter_properties( filter );
                                mlt_properties_inherit( properties, group );
                        }
@@ -190,6 +203,20 @@ mlt_producer producer_inigo_init( char **argv )
                                properties = mlt_producer_properties( producer );
                        }
                }
+               else if ( !strcmp( argv[ i ], "-swap" ) )
+               {
+                       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+                               mlt_playlist_append( playlist, producer );
+                       producer = NULL;
+                       if ( mlt_playlist_count( playlist ) >= 2 )
+                       {
+                               mlt_playlist_clip_info info;
+                               mlt_playlist_move( playlist, mlt_playlist_count( playlist ) - 2, mlt_playlist_count( playlist ) - 1 );
+                               mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+                               producer = info.cut;
+                               properties = mlt_producer_properties( producer );
+                       }
+               }
                else if ( !strcmp( argv[ i ], "-join" ) )
                {
                        int clips = atoi( argv[ ++ i ] );
@@ -205,6 +232,20 @@ mlt_producer producer_inigo_init( char **argv )
                                properties = mlt_producer_properties( producer );
                        }
                }
+               else if ( !strcmp( argv[ i ], "-remove" ) )
+               {
+                       if ( producer != NULL && !mlt_producer_is_cut( producer ) )
+                               mlt_playlist_append( playlist, producer );
+                       producer = NULL;
+                       if ( mlt_playlist_count( playlist ) > 0 )
+                       {
+                               mlt_playlist_clip_info info;
+                               mlt_playlist_remove( playlist, mlt_playlist_count( playlist ) - 1 );
+                               mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 1 );
+                               producer = info.cut;
+                               properties = mlt_producer_properties( producer );
+                       }
+               }
                else if ( !strcmp( argv[ i ], "-mix" ) )
                {
                        int length = atoi( argv[ ++ i ] );
@@ -220,6 +261,7 @@ mlt_producer producer_inigo_init( char **argv )
                                        if ( mlt_properties_get_data( ( mlt_properties )info.producer, "mlt_mix", NULL ) == NULL )
                                                mlt_playlist_get_clip_info( playlist, &info, mlt_playlist_count( playlist ) - 2 );
                                        mix = ( mlt_tractor )mlt_properties_get_data( ( mlt_properties )info.producer, "mlt_mix", NULL );
+                                       properties = NULL;
                                }
                                else
                                {
@@ -231,24 +273,6 @@ mlt_producer producer_inigo_init( char **argv )
                                fprintf( stderr, "Invalid position for a mix...\n" );
                        }
                }
-               else if ( !strcmp( argv[ i ], "-filter" ) )
-               {
-                       mlt_filter filter = create_filter( field, argv[ ++ i ], track );
-                       if ( filter != NULL )
-                       {
-                               properties = mlt_filter_properties( filter );
-                               mlt_properties_inherit( properties, group );
-                       }
-               }
-               else if ( !strcmp( argv[ i ], "-transition" ) )
-               {
-                       mlt_transition transition = create_transition( field, argv[ ++ i ], track - 1 );
-                       if ( transition != NULL )
-                       {
-                               properties = mlt_transition_properties( transition );
-                               mlt_properties_inherit( properties, group );
-                       }
-               }
                else if ( !strcmp( argv[ i ], "-mixer" ) )
                {
                        if ( mix != NULL )
@@ -276,6 +300,24 @@ mlt_producer producer_inigo_init( char **argv )
                                fprintf( stderr, "Invalid mixer...\n" );
                        }
                }
+               else if ( !strcmp( argv[ i ], "-filter" ) )
+               {
+                       mlt_filter filter = create_filter( field, argv[ ++ i ], track );
+                       if ( filter != NULL )
+                       {
+                               properties = mlt_filter_properties( filter );
+                               mlt_properties_inherit( properties, group );
+                       }
+               }
+               else if ( !strcmp( argv[ i ], "-transition" ) )
+               {
+                       mlt_transition transition = create_transition( field, argv[ ++ i ], track - 1 );
+                       if ( transition != NULL )
+                       {
+                               properties = mlt_transition_properties( transition );
+                               mlt_properties_inherit( properties, group );
+                       }
+               }
                else if ( !strcmp( argv[ i ], "-blank" ) )
                {
                        if ( producer != NULL && !mlt_producer_is_cut( producer ) )