X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_factory.c;h=d7c6f000254dccf53b7324b84057aa619d3bf6b6;hb=7234b0f5d3e765ab4f6385036a218cc410284d68;hp=3045e968b96d4b9fddd333172e5d82299975a232;hpb=390e1559353efa011b371b66fcd2c8d3ffb84ab8;p=melted diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c index 3045e96..d7c6f00 100644 --- a/src/framework/mlt_factory.c +++ b/src/framework/mlt_factory.c @@ -3,22 +3,21 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * 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 ); @@ -111,9 +103,12 @@ int mlt_factory_init( const char *prefix ) 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" ) ); + 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. @@ -124,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. @@ -137,13 +132,37 @@ 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. +*/ + +int mlt_environment_set( const char *name, const char *value ) +{ + if ( global_properties ) + return mlt_properties_set( global_properties, name, value ); + else + return -1; +} + +static void set_common_properties( mlt_properties properties, mlt_profile profile, const char *type, const char *service ) +{ + mlt_properties_set_int( properties, "_unique_id", ++ unique_id ); + mlt_properties_set( properties, "mlt_type", type ); + if ( mlt_properties_get_int( properties, "_mlt_service_hidden" ) == 0 ) + mlt_properties_set( properties, "mlt_service", service ); + if ( profile != NULL ) + mlt_properties_set_data( properties, "_profile", profile, 0, NULL, NULL ); } /** Fetch a producer from the repository. */ -mlt_producer mlt_factory_producer( const char *service, void *input ) +mlt_producer mlt_factory_producer( mlt_profile profile, const char *service, void *input ) { mlt_producer obj = NULL; @@ -157,15 +176,12 @@ mlt_producer mlt_factory_producer( const char *service, void *input ) // Try to instantiate via the specified service if ( obj == NULL ) { - obj = mlt_repository_fetch( producers, 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 ) { 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 ); + set_common_properties( properties, profile, "producer", service ); } } return obj; @@ -174,7 +190,7 @@ mlt_producer mlt_factory_producer( const char *service, void *input ) /** Fetch a filter from the repository. */ -mlt_filter mlt_factory_filter( const char *service, void *input ) +mlt_filter mlt_factory_filter( mlt_profile profile, const char *service, void *input ) { mlt_filter obj = NULL; @@ -183,16 +199,14 @@ mlt_filter mlt_factory_filter( const char *service, void *input ) if ( obj == NULL ) { - obj = mlt_repository_fetch( filters, service, input ); + obj = mlt_repository_create( repository, profile, filter_type, service, input ); mlt_events_fire( event_object, "filter-create-done", service, input, obj, NULL ); } 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 ); + set_common_properties( properties, profile, "filter", service ); } return obj; } @@ -200,7 +214,7 @@ mlt_filter mlt_factory_filter( const char *service, void *input ) /** Fetch a transition from the repository. */ -mlt_transition mlt_factory_transition( const char *service, void *input ) +mlt_transition mlt_factory_transition( mlt_profile profile, const char *service, void *input ) { mlt_transition obj = NULL; @@ -209,16 +223,14 @@ mlt_transition mlt_factory_transition( const char *service, void *input ) if ( obj == NULL ) { - obj = mlt_repository_fetch( transitions, service, input ); + obj = mlt_repository_create( repository, profile, transition_type, service, input ); mlt_events_fire( event_object, "transition-create-done", service, input, obj, NULL ); } 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 ); + set_common_properties( properties, profile, "transition", service ); } return obj; } @@ -226,7 +238,7 @@ mlt_transition mlt_factory_transition( const char *service, void *input ) /** Fetch a consumer from the repository */ -mlt_consumer mlt_factory_consumer( const char *service, void *input ) +mlt_consumer mlt_factory_consumer( mlt_profile profile, const char *service, void *input ) { mlt_consumer obj = NULL; @@ -238,19 +250,14 @@ mlt_consumer mlt_factory_consumer( const char *service, void *input ) if ( obj == NULL ) { - obj = mlt_repository_fetch( consumers, service, input ); + obj = mlt_repository_create( repository, profile, consumer_type, service, input ); mlt_events_fire( event_object, "consumer-create-done", service, input, obj, NULL ); } 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 ); + set_common_properties( properties, profile, "consumer", service ); } return obj; } @@ -270,18 +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( ); } } -