X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_factory.c;h=dbaf2dbd58f7bdbb01e6c28e46c890cf9de85940;hb=ebcbb3571620a43fe24b3f8fa0161096ef628dbe;hp=dee338e3bab2d36d0716568c8db2791c48454de4;hpb=2a800ec4c840132c7a629b764b673dce09771637;p=melted

diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c
index dee338e..dbaf2db 100644
--- a/src/framework/mlt_factory.c
+++ b/src/framework/mlt_factory.c
@@ -47,7 +47,7 @@ int mlt_factory_init( char *prefix )
 	if ( mlt_prefix == NULL )
 	{
 		// Allow user over rides
-		if ( prefix == NULL )
+		if ( prefix == NULL || !strcmp( prefix, "" ) )
 			prefix = getenv( "MLT_REPOSITORY" );
 
 		// If no directory is specified, default to install directory
@@ -65,15 +65,19 @@ int mlt_factory_init( char *prefix )
 		mlt_properties_set_or_default( global_properties, "MLT_NORMALISATION", getenv( "MLT_NORMALISATION" ), "PAL" );
 		mlt_properties_set_or_default( global_properties, "MLT_PRODUCER", getenv( "MLT_PRODUCER" ), "fezzik" );
 		mlt_properties_set_or_default( global_properties, "MLT_CONSUMER", getenv( "MLT_CONSUMER" ), "sdl" );
+		mlt_properties_set( global_properties, "MLT_TEST_CARD", getenv( "MLT_TEST_CARD" ) );
 
 		// Create the object list.
 		object_list = mlt_properties_new( );
 
 		// Create a repository for each service type
-		producers = mlt_repository_init( object_list, prefix, "producers.dat", "mlt_create_producer" );
-		filters = mlt_repository_init( object_list, prefix, "filters.dat", "mlt_create_filter" );
-		transitions = mlt_repository_init( object_list, prefix, "transitions.dat", "mlt_create_transition" );
-		consumers = mlt_repository_init( object_list, prefix, "consumers.dat", "mlt_create_consumer" );
+		producers = mlt_repository_init( object_list, prefix, "producers", "mlt_create_producer" );
+		filters = mlt_repository_init( object_list, prefix, "filters", "mlt_create_filter" );
+		transitions = mlt_repository_init( object_list, prefix, "transitions", "mlt_create_transition" );
+		consumers = mlt_repository_init( object_list, prefix, "consumers", "mlt_create_consumer" );
+
+		// Force a clean up when app closes
+		atexit( mlt_factory_close );
 	}
 
 	return 0;
@@ -166,14 +170,27 @@ mlt_consumer mlt_factory_consumer( char *service, void *input )
 
 	if ( obj != NULL )
 	{
+		mlt_filter filter = mlt_factory_filter( "data_show", NULL );
 		mlt_properties properties = mlt_consumer_properties( obj );
 		mlt_properties_set_int( properties, "_unique_id", ++ unique_id );
 		mlt_properties_set( properties, "mlt_type", "consumer" );
 		mlt_properties_set( properties, "mlt_service", service );
+		mlt_service_attach( mlt_consumer_service( obj ), filter );
+		mlt_filter_close( filter );
 	}
 	return obj;
 }
 
+/** Register an object for clean up.
+*/
+
+void mlt_factory_register_for_clean_up( void *ptr, mlt_destructor destructor )
+{
+	char unique[ 256 ];
+	sprintf( unique, "%08d", mlt_properties_count( global_properties ) );
+	mlt_properties_set_data( global_properties, unique, ptr, 0, destructor, NULL );
+}
+
 /** Close the factory.
 */
 
@@ -185,8 +202,8 @@ void mlt_factory_close( )
 		mlt_repository_close( filters );
 		mlt_repository_close( transitions );
 		mlt_repository_close( consumers );
-		mlt_properties_close( object_list );
 		mlt_properties_close( global_properties );
+		mlt_properties_close( object_list );
 		free( mlt_prefix );
 		mlt_prefix = NULL;
 		mlt_pool_close( );