Fixes threaded pixbuf usage and removes flash when swicthing between sdl preview...

[melted] / src / miracle / miracle.c

diff --git a/src/miracle/miracle.c b/src/miracle/miracle.c
index 8d1294d..913f785 100644 (file)
--- a/src/miracle/miracle.c
+++ b/src/miracle/miracle.c
@@ -45,8 +45,7 @@ static miracle_server server = NULL;
 
 static void main_cleanup( )
 {
-       miracle_server_shutdown( server );
-       mlt_factory_close( );
+       miracle_server_close( server );
 }
 
 /** Report usage and exit.
@@ -68,8 +67,7 @@ int main( int argc, char **argv )
        int background = 1;
        struct timespec tm = { 5, 0 };
 
-       // Construct the factory
-       mlt_factory_init( getenv( "MLT_REPOSITORY" ) );
+       mlt_factory_init( NULL );
 
        server = miracle_server_init( argv[ 0 ] );
 
@@ -101,6 +99,9 @@ int main( int argc, char **argv )
 
        atexit( main_cleanup );
 
+       /* Set the config script */
+       miracle_server_set_config( server, "/etc/miracle.conf" );
+
        /* Execute the server */
        error = miracle_server_execute( server );