X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_factory.c;h=d7c6f000254dccf53b7324b84057aa619d3bf6b6;hb=54e9e3e12d93108b28661cc5aae148bac22ff35f;hp=0b4508c505b2a8615fb1333cb989dd5edd48213f;hpb=1a16869c02718e42807618ed5c7a37478dd9577c;p=melted diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c index 0b4508c..d7c6f00 100644 --- a/src/framework/mlt_factory.c +++ b/src/framework/mlt_factory.c @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" #include "mlt.h" #include "mlt_repository.h" @@ -26,16 +25,15 @@ #include #include +#define PREFIX_LIB LIBDIR "/mlt" +#define PREFIX_DATA PREFIX "/share/mlt" + /** Singleton repositories */ -static char *mlt_prefix = NULL; +static char *mlt_directory = 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 mlt_repository repository = NULL; static mlt_properties event_object = NULL; static int unique_id = 0; @@ -57,21 +55,21 @@ static void mlt_factory_create_done( mlt_listener listener, mlt_properties owner /** Construct the factories. */ -int mlt_factory_init( const char *prefix ) +mlt_repository mlt_factory_init( const char *directory ) { // Only initialise once - if ( mlt_prefix == NULL ) + if ( mlt_directory == NULL ) { // Allow user over rides - if ( prefix == NULL || !strcmp( prefix, "" ) ) - prefix = getenv( "MLT_REPOSITORY" ); + if ( directory == NULL || !strcmp( directory, "" ) ) + directory = getenv( "MLT_REPOSITORY" ); // If no directory is specified, default to install directory - if ( prefix == NULL ) - prefix = PREFIX_DATA; + if ( directory == NULL ) + directory = PREFIX_LIB; // Store the prefix for later retrieval - mlt_prefix = strdup( prefix ); + mlt_directory = strdup( directory ); // Initialise the pool mlt_pool_init( ); @@ -91,14 +89,8 @@ int mlt_factory_init( const char *prefix ) // Create the global properties global_properties = mlt_properties_new( ); - // Create the object list. - object_list = mlt_properties_new( ); - - // Create a repository for each service type - 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" ); + // Create the repository of services + repository = mlt_repository_init( directory ); // Force a clean up when app closes atexit( mlt_factory_close ); @@ -112,10 +104,11 @@ int mlt_factory_init( const char *prefix ) 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" ) ); mlt_properties_set_or_default( global_properties, "MLT_PROFILE", getenv( "MLT_PROFILE" ), "dv_pal" ); + mlt_properties_set_or_default( global_properties, "MLT_DATA", getenv( "MLT_DATA" ), PREFIX_DATA ); } - return 0; + return repository; } /** Fetch the events object. @@ -126,12 +119,12 @@ mlt_properties mlt_factory_event_object( ) return event_object; } -/** Fetch the prefix used in this instance. +/** Fetch the module directory used in this instance. */ -const char *mlt_factory_prefix( ) +const char *mlt_factory_directory( ) { - return mlt_prefix; + return mlt_directory; } /** Get a value from the environment. @@ -139,7 +132,10 @@ const char *mlt_factory_prefix( ) char *mlt_environment( const char *name ) { - return mlt_properties_get( global_properties, name ); + if ( global_properties ) + return mlt_properties_get( global_properties, name ); + else + return NULL; } /** Set a value in the environment. @@ -180,7 +176,7 @@ mlt_producer mlt_factory_producer( mlt_profile profile, const char *service, voi // Try to instantiate via the specified service if ( obj == NULL ) { - obj = mlt_repository_fetch( producers, profile, producer_type, service, input ); + obj = mlt_repository_create( repository, profile, producer_type, service, input ); mlt_events_fire( event_object, "producer-create-done", service, input, obj, NULL ); if ( obj != NULL ) { @@ -203,7 +199,7 @@ mlt_filter mlt_factory_filter( mlt_profile profile, const char *service, void *i if ( obj == NULL ) { - obj = mlt_repository_fetch( filters, profile, filter_type, service, input ); + obj = mlt_repository_create( repository, profile, filter_type, service, input ); mlt_events_fire( event_object, "filter-create-done", service, input, obj, NULL ); } @@ -227,7 +223,7 @@ mlt_transition mlt_factory_transition( mlt_profile profile, const char *service, if ( obj == NULL ) { - obj = mlt_repository_fetch( transitions, profile, filter_type, service, input ); + obj = mlt_repository_create( repository, profile, transition_type, service, input ); mlt_events_fire( event_object, "transition-create-done", service, input, obj, NULL ); } @@ -254,7 +250,7 @@ mlt_consumer mlt_factory_consumer( mlt_profile profile, const char *service, voi if ( obj == NULL ) { - obj = mlt_repository_fetch( consumers, profile, consumer_type, service, input ); + obj = mlt_repository_create( repository, profile, consumer_type, service, input ); mlt_events_fire( event_object, "consumer-create-done", service, input, obj, NULL ); } @@ -281,17 +277,13 @@ void mlt_factory_register_for_clean_up( void *ptr, mlt_destructor destructor ) void mlt_factory_close( ) { - if ( mlt_prefix != NULL ) + if ( mlt_directory != NULL ) { mlt_properties_close( event_object ); - mlt_repository_close( producers ); - mlt_repository_close( filters ); - mlt_repository_close( transitions ); - mlt_repository_close( consumers ); mlt_properties_close( global_properties ); - mlt_properties_close( object_list ); - free( mlt_prefix ); - mlt_prefix = NULL; + mlt_repository_close( repository ); + free( mlt_directory ); + mlt_directory = NULL; mlt_pool_close( ); } }