X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_factory.c;h=699dca30898d3462a331bc27a0d2e1544c7f338a;hb=52c1bb26fcbb895824cd9237c228ea4834ce1433;hp=0b4df21481c375f3b9a0bc640f339efaf3745362;hpb=2af8bb9f6a61f6510aab8f45abf5f26e9e619c78;p=melted

diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c
index 0b4df21..699dca3 100644
--- a/src/framework/mlt_factory.c
+++ b/src/framework/mlt_factory.c
@@ -46,6 +46,10 @@ int mlt_factory_init( char *prefix )
 	// Only initialise once
 	if ( mlt_prefix == NULL )
 	{
+		// Allow user over rides
+		if ( prefix == NULL || !strcmp( prefix, "" ) )
+			prefix = getenv( "MLT_REPOSITORY" );
+
 		// If no directory is specified, default to install directory
 		if ( prefix == NULL )
 			prefix = PREFIX_DATA;
@@ -58,16 +62,19 @@ int mlt_factory_init( char *prefix )
 
 		// Create the global properties
 		global_properties = mlt_properties_new( );
-		mlt_properties_set( global_properties, "MLT_NORMALISATION", getenv( "MLT_NORMALISATION" ) );
+		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" );
 	}
 
 	return 0;
@@ -94,7 +101,15 @@ char *mlt_environment( char *name )
 
 mlt_producer mlt_factory_producer( char *service, void *input )
 {
-	mlt_producer obj = mlt_repository_fetch( producers, service, input );
+	mlt_producer obj = NULL;
+
+	// Pick up the default normalising producer if necessary
+	if ( service == NULL )
+		service = mlt_environment( "MLT_PRODUCER" );
+
+	// Try to instantiate via the specified service
+	obj = mlt_repository_fetch( producers, service, input );
+
 	if ( obj != NULL )
 	{
 		mlt_properties properties = mlt_producer_properties( obj );
@@ -143,7 +158,13 @@ mlt_transition mlt_factory_transition( char *service, void *input )
 
 mlt_consumer mlt_factory_consumer( char *service, void *input )
 {
-	mlt_consumer obj = mlt_repository_fetch( consumers, service, input );
+	mlt_consumer obj = NULL;
+
+	if ( service == NULL )
+		service = mlt_environment( "MLT_CONSUMER" );
+
+	obj = mlt_repository_fetch( consumers, service, input );
+
 	if ( obj != NULL )
 	{
 		mlt_properties properties = mlt_consumer_properties( obj );
@@ -154,6 +175,16 @@ mlt_consumer mlt_factory_consumer( char *service, void *input )
 	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.
 */
 
@@ -165,8 +196,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( );