albino

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

diff --git a/mlt/src/miracle/miracle.c b/mlt/src/miracle/miracle.c
index 8d1294d..e3d26f4 100644 (file)
--- a/mlt/src/miracle/miracle.c
+++ b/mlt/src/miracle/miracle.c
@@ -46,7 +46,6 @@ static miracle_server server = NULL;
 static void main_cleanup( )
 {
        miracle_server_shutdown( server );
-       mlt_factory_close( );
 }
 
 /** Report usage and exit.
@@ -68,9 +67,6 @@ int main( int argc, char **argv )
        int background = 1;
        struct timespec tm = { 5, 0 };
 
-       // Construct the factory
-       mlt_factory_init( getenv( "MLT_REPOSITORY" ) );
-
        server = miracle_server_init( argv[ 0 ] );
 
        for ( index = 1; index < argc; index ++ )

diff --git a/mlt/src/miracle/miracle_local.c b/mlt/src/miracle/miracle_local.c
index ac6c757..e9ef50e 100644 (file)
--- a/mlt/src/miracle/miracle_local.c
+++ b/mlt/src/miracle/miracle_local.c
@@ -83,6 +83,9 @@ valerie_parser miracle_parser_init_local( )
                        local->parser = parser;
                        local->root_dir[0] = '/';
                }
+
+               // Construct the factory
+               mlt_factory_init( getenv( "MLT_REPOSITORY" ) );
        }
        return parser;
 }
@@ -452,4 +455,5 @@ static void miracle_local_close( miracle_local local )
        pthread_kill_other_threads_np();
        miracle_log( LOG_DEBUG, "Clean shutdown." );
        free( local );
+       mlt_factory_close( );
 }

diff --git a/src/miracle/miracle.c b/src/miracle/miracle.c
index 8d1294d..e3d26f4 100644 (file)
--- a/src/miracle/miracle.c
+++ b/src/miracle/miracle.c
@@ -46,7 +46,6 @@ static miracle_server server = NULL;
 static void main_cleanup( )
 {
        miracle_server_shutdown( server );
-       mlt_factory_close( );
 }
 
 /** Report usage and exit.
@@ -68,9 +67,6 @@ int main( int argc, char **argv )
        int background = 1;
        struct timespec tm = { 5, 0 };
 
-       // Construct the factory
-       mlt_factory_init( getenv( "MLT_REPOSITORY" ) );
-
        server = miracle_server_init( argv[ 0 ] );
 
        for ( index = 1; index < argc; index ++ )

diff --git a/src/miracle/miracle_local.c b/src/miracle/miracle_local.c
index ac6c757..e9ef50e 100644 (file)
--- a/src/miracle/miracle_local.c
+++ b/src/miracle/miracle_local.c
@@ -83,6 +83,9 @@ valerie_parser miracle_parser_init_local( )
                        local->parser = parser;
                        local->root_dir[0] = '/';
                }
+
+               // Construct the factory
+               mlt_factory_init( getenv( "MLT_REPOSITORY" ) );
        }
        return parser;
 }
@@ -452,4 +455,5 @@ static void miracle_local_close( miracle_local local )
        pthread_kill_other_threads_np();
        miracle_log( LOG_DEBUG, "Clean shutdown." );
        free( local );
+       mlt_factory_close( );
 }