inigo rewrite, producer, serialise and deserialise

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@63 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/mlt/src/inigo/inigo.c b/mlt/src/inigo/inigo.c
index 38e0d13cebb5d8d0ac98c368e4c7ad3205a57166..2dec87a418a7fe06977a3746d47cd7abc161c59f 100644 (file)
--- a/mlt/src/inigo/inigo.c
+++ b/mlt/src/inigo/inigo.c
@@ -177,9 +177,8 @@ int main( int argc, char **argv )
                        else if ( !strcmp( argv[ i ], "-consumer" ) )
                        {
                                consumer = create_consumer( argv[ ++ i ], inigo );
-                               while ( strstr( argv[ ++ i ], "=" ) )
-                                       mlt_properties_parse( group, argv[ i ] );
-                               i --;
+                               while ( argv[ i + 1 ] != NULL && strstr( argv[ i + 1 ], "=" ) )
+                                       mlt_properties_parse( group, argv[ ++ i ] );
                        }
                        else
                        {
@@ -211,8 +210,6 @@ int main( int argc, char **argv )
                        // Transport functionality
                        transport( inigo );
                        
-                       // Close the consumer
-                       mlt_consumer_close( consumer );
                }
                else if ( store != NULL )
                {
@@ -220,8 +217,6 @@ int main( int argc, char **argv )
                        fclose( store );
                }
 
-               // Close the producer
-               mlt_producer_close( inigo );
        }
        else
        {
@@ -233,6 +228,14 @@ int main( int argc, char **argv )
                                         "             [ producer [ name=value ] * ]+\n" );
        }
 
+       // Close the consumer
+       if ( consumer != NULL )
+               mlt_consumer_close( consumer );
+
+       // Close the producer
+       if ( inigo != NULL )
+               mlt_producer_close( inigo );
+
        // Close the factory
        mlt_factory_close( );
 

diff --git a/mlt/src/modules/inigo/producer_inigo.c b/mlt/src/modules/inigo/producer_inigo.c
index a3dbc10662030f8ee93fee0ca4afdd89fb07d8b3..efe2d766ed13661d29e917f9605188dea04d9414 100644 (file)
--- a/mlt/src/modules/inigo/producer_inigo.c
+++ b/mlt/src/modules/inigo/producer_inigo.c
@@ -158,11 +158,7 @@ mlt_producer producer_inigo_init( char **argv )
        // Parse the arguments
        for ( i = 0; argv[ i ] != NULL; i ++ )
        {
-               if ( !strcmp( argv[ i ], "-serialise" ) )
-               {
-                       i ++;
-               }
-               else if ( !strcmp( argv[ i ], "-group" ) )
+               if ( !strcmp( argv[ i ], "-group" ) )
                {
                        if ( mlt_properties_count( group ) != 0 )
                        {
@@ -222,9 +218,12 @@ mlt_producer producer_inigo_init( char **argv )
                }
                else
                {
-                       while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
+                       if ( !strcmp( argv[ i ], "-serialise" ) )
+                               i ++;
+                       else if ( !strcmp( argv[ i ], "-consumer" ) )
+                               i ++;
+                       else while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
                                i ++;
-                       i --;
                }
        }
 

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index 38e0d13cebb5d8d0ac98c368e4c7ad3205a57166..2dec87a418a7fe06977a3746d47cd7abc161c59f 100644 (file)
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -177,9 +177,8 @@ int main( int argc, char **argv )
                        else if ( !strcmp( argv[ i ], "-consumer" ) )
                        {
                                consumer = create_consumer( argv[ ++ i ], inigo );
-                               while ( strstr( argv[ ++ i ], "=" ) )
-                                       mlt_properties_parse( group, argv[ i ] );
-                               i --;
+                               while ( argv[ i + 1 ] != NULL && strstr( argv[ i + 1 ], "=" ) )
+                                       mlt_properties_parse( group, argv[ ++ i ] );
                        }
                        else
                        {
@@ -211,8 +210,6 @@ int main( int argc, char **argv )
                        // Transport functionality
                        transport( inigo );
                        
-                       // Close the consumer
-                       mlt_consumer_close( consumer );
                }
                else if ( store != NULL )
                {
@@ -220,8 +217,6 @@ int main( int argc, char **argv )
                        fclose( store );
                }
 
-               // Close the producer
-               mlt_producer_close( inigo );
        }
        else
        {
@@ -233,6 +228,14 @@ int main( int argc, char **argv )
                                         "             [ producer [ name=value ] * ]+\n" );
        }
 
+       // Close the consumer
+       if ( consumer != NULL )
+               mlt_consumer_close( consumer );
+
+       // Close the producer
+       if ( inigo != NULL )
+               mlt_producer_close( inigo );
+
        // Close the factory
        mlt_factory_close( );
 

diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index a3dbc10662030f8ee93fee0ca4afdd89fb07d8b3..efe2d766ed13661d29e917f9605188dea04d9414 100644 (file)
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -158,11 +158,7 @@ mlt_producer producer_inigo_init( char **argv )
        // Parse the arguments
        for ( i = 0; argv[ i ] != NULL; i ++ )
        {
-               if ( !strcmp( argv[ i ], "-serialise" ) )
-               {
-                       i ++;
-               }
-               else if ( !strcmp( argv[ i ], "-group" ) )
+               if ( !strcmp( argv[ i ], "-group" ) )
                {
                        if ( mlt_properties_count( group ) != 0 )
                        {
@@ -222,9 +218,12 @@ mlt_producer producer_inigo_init( char **argv )
                }
                else
                {
-                       while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
+                       if ( !strcmp( argv[ i ], "-serialise" ) )
+                               i ++;
+                       else if ( !strcmp( argv[ i ], "-consumer" ) )
+                               i ++;
+                       else while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
                                i ++;
-                       i --;
                }
        }