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

diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c
index 3b40464..0b4df21 100644
--- a/src/framework/mlt_factory.c
+++ b/src/framework/mlt_factory.c
@@ -19,37 +19,91 @@
  */
 
 #include "config.h"
-#include "mlt_factory.h"
+#include "mlt.h"
 #include "mlt_repository.h"
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 /** Singleton repositories
 */
 
+static char *mlt_prefix = NULL;
+static mlt_properties global_properties = NULL;
+static mlt_properties object_list = NULL;
 static mlt_repository producers = NULL;
 static mlt_repository filters = NULL;
 static mlt_repository transitions = NULL;
 static mlt_repository consumers = NULL;
+static int unique_id = 0;
 
 /** Construct the factories.
 */
 
-int mlt_factory_init( )
+int mlt_factory_init( char *prefix )
 {
-	producers = mlt_repository_init( PREFIX_DATA "/producers.dat", "mlt_create_producer" );
-	filters = mlt_repository_init( PREFIX_DATA "/filters.dat", "mlt_create_filter" );
-	transitions = mlt_repository_init( PREFIX_DATA "/transitions.dat", "mlt_create_transition" );
-	consumers = mlt_repository_init( PREFIX_DATA "/consumers.dat", "mlt_create_consumer" );
+	// Only initialise once
+	if ( mlt_prefix == NULL )
+	{
+		// If no directory is specified, default to install directory
+		if ( prefix == NULL )
+			prefix = PREFIX_DATA;
+
+		// Store the prefix for later retrieval
+		mlt_prefix = strdup( prefix );
+
+		// Initialise the pool
+		mlt_pool_init( );
+
+		// Create the global properties
+		global_properties = mlt_properties_new( );
+		mlt_properties_set( global_properties, "MLT_NORMALISATION", getenv( "MLT_NORMALISATION" ) );
+
+		// 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" );
+	}
+
 	return 0;
 }
 
+/** Fetch the prefix used in this instance.
+*/
+
+const char *mlt_factory_prefix( )
+{
+	return mlt_prefix;
+}
+
+/** Get a value from the environment.
+*/
+
+char *mlt_environment( char *name )
+{
+	return mlt_properties_get( global_properties, name );
+}
+
 /** Fetch a producer from the repository.
 */
 
 mlt_producer mlt_factory_producer( char *service, void *input )
 {
-	return ( mlt_producer )mlt_repository_fetch( producers, service, input );
+	mlt_producer obj = mlt_repository_fetch( producers, service, input );
+	if ( obj != NULL )
+	{
+		mlt_properties properties = mlt_producer_properties( obj );
+		mlt_properties_set_int( properties, "_unique_id", ++ unique_id );
+		mlt_properties_set( properties, "mlt_type", "producer" );
+		if ( mlt_properties_get_int( properties, "_mlt_service_hidden" ) == 0 )
+			mlt_properties_set( properties, "mlt_service", service );
+	}
+	return obj;
 }
 
 /** Fetch a filter from the repository.
@@ -57,15 +111,31 @@ mlt_producer mlt_factory_producer( char *service, void *input )
 
 mlt_filter mlt_factory_filter( char *service, void *input )
 {
-	return ( mlt_filter )mlt_repository_fetch( filters, service, input );
+	mlt_filter obj = mlt_repository_fetch( filters, service, input );
+	if ( obj != NULL )
+	{
+		mlt_properties properties = mlt_filter_properties( obj );
+		mlt_properties_set_int( properties, "_unique_id", ++ unique_id );
+		mlt_properties_set( properties, "mlt_type", "filter" );
+		mlt_properties_set( properties, "mlt_service", service );
+	}
+	return obj;
 }
 
 /** Fetch a transition from the repository.
 */
 
-mlt_transition mlt_transition_filter( char *service, void *input )
+mlt_transition mlt_factory_transition( char *service, void *input )
 {
-	return ( mlt_transition )mlt_repository_fetch( transitions, service, input );
+	mlt_transition obj = mlt_repository_fetch( transitions, service, input );
+	if ( obj != NULL )
+	{
+		mlt_properties properties = mlt_transition_properties( obj );
+		mlt_properties_set_int( properties, "_unique_id", ++ unique_id );
+		mlt_properties_set( properties, "mlt_type", "transition" );
+		mlt_properties_set( properties, "mlt_service", service );
+	}
+	return obj;
 }
 
 /** Fetch a consumer from the repository
@@ -73,7 +143,15 @@ mlt_transition mlt_transition_filter( char *service, void *input )
 
 mlt_consumer mlt_factory_consumer( char *service, void *input )
 {
-	return ( mlt_consumer )mlt_repository_fetch( consumers, service, input );
+	mlt_consumer obj = mlt_repository_fetch( consumers, service, input );
+	if ( obj != 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 );
+	}
+	return obj;
 }
 
 /** Close the factory.
@@ -81,9 +159,17 @@ mlt_consumer mlt_factory_consumer( char *service, void *input )
 
 void mlt_factory_close( )
 {
-	mlt_repository_close( producers );
-	mlt_repository_close( filters );
-	mlt_repository_close( transitions );
-	mlt_repository_close( consumers );
+	if ( mlt_prefix != NULL )
+	{
+		mlt_repository_close( producers );
+		mlt_repository_close( filters );
+		mlt_repository_close( transitions );
+		mlt_repository_close( consumers );
+		mlt_properties_close( object_list );
+		mlt_properties_close( global_properties );
+		free( mlt_prefix );
+		mlt_prefix = NULL;
+		mlt_pool_close( );
+	}
 }