X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_factory.c;h=1272a8e794400fef5fffab95d8230a04d1ea704e;hb=b79a3f74f655a4ab8bb087454624d11eca6d9b34;hp=699dca30898d3462a331bc27a0d2e1544c7f338a;hpb=2ff111fe322cfdea5b879dd7912a8a375af62aff;p=melted

diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c
index 699dca3..1272a8e 100644
--- a/src/framework/mlt_factory.c
+++ b/src/framework/mlt_factory.c
@@ -36,12 +36,28 @@ static mlt_repository producers = NULL;
 static mlt_repository filters = NULL;
 static mlt_repository transitions = NULL;
 static mlt_repository consumers = NULL;
+static mlt_properties event_object = NULL;
 static int unique_id = 0;
 
+/** Event transmitters.
+*/
+
+static void mlt_factory_create_request( mlt_listener listener, mlt_properties owner, mlt_service this, void **args )
+{
+	if ( listener != NULL )
+		listener( owner, this, ( char * )args[ 0 ], ( char * )args[ 1 ], ( mlt_service * )args[ 2 ] );
+}
+
+static void mlt_factory_create_done( mlt_listener listener, mlt_properties owner, mlt_service this, void **args )
+{
+	if ( listener != NULL )
+		listener( owner, this, ( char * )args[ 0 ], ( char * )args[ 1 ], ( mlt_service )args[ 2 ] );
+}
+
 /** Construct the factories.
 */
 
-int mlt_factory_init( char *prefix )
+int mlt_factory_init( const char *prefix )
 {
 	// Only initialise once
 	if ( mlt_prefix == NULL )
@@ -60,6 +76,18 @@ int mlt_factory_init( char *prefix )
 		// Initialise the pool
 		mlt_pool_init( );
 
+		// Create and set up the events object
+		event_object = mlt_properties_new( );
+		mlt_events_init( event_object );
+		mlt_events_register( event_object, "producer-create-request", ( mlt_transmitter )mlt_factory_create_request );
+		mlt_events_register( event_object, "producer-create-done", ( mlt_transmitter )mlt_factory_create_done );
+		mlt_events_register( event_object, "filter-create-request", ( mlt_transmitter )mlt_factory_create_request );
+		mlt_events_register( event_object, "filter-create-done", ( mlt_transmitter )mlt_factory_create_done );
+		mlt_events_register( event_object, "transition-create-request", ( mlt_transmitter )mlt_factory_create_request );
+		mlt_events_register( event_object, "transition-create-done", ( mlt_transmitter )mlt_factory_create_done );
+		mlt_events_register( event_object, "consumer-create-request", ( mlt_transmitter )mlt_factory_create_request );
+		mlt_events_register( event_object, "consumer-create-done", ( mlt_transmitter )mlt_factory_create_done );
+
 		// Create the global properties
 		global_properties = mlt_properties_new( );
 		mlt_properties_set_or_default( global_properties, "MLT_NORMALISATION", getenv( "MLT_NORMALISATION" ), "PAL" );
@@ -75,11 +103,22 @@ int mlt_factory_init( char *prefix )
 		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;
 }
 
+/** Fetch the events object.
+*/
+
+mlt_properties mlt_factory_event_object( )
+{
+	return event_object;
+}
+
 /** Fetch the prefix used in this instance.
 */
 
@@ -91,7 +130,7 @@ const char *mlt_factory_prefix( )
 /** Get a value from the environment.
 */
 
-char *mlt_environment( char *name )
+char *mlt_environment( const char *name )
 {
 	return mlt_properties_get( global_properties, name );
 }
@@ -99,7 +138,7 @@ char *mlt_environment( char *name )
 /** Fetch a producer from the repository.
 */
 
-mlt_producer mlt_factory_producer( char *service, void *input )
+mlt_producer mlt_factory_producer( const char *service, void *input )
 {
 	mlt_producer obj = NULL;
 
@@ -107,16 +146,22 @@ mlt_producer mlt_factory_producer( char *service, void *input )
 	if ( service == NULL )
 		service = mlt_environment( "MLT_PRODUCER" );
 
-	// Try to instantiate via the specified service
-	obj = mlt_repository_fetch( producers, service, input );
+	// Offer the application the chance to 'create'
+	mlt_events_fire( event_object, "producer-create-request", service, input, &obj, NULL );
 
-	if ( obj != NULL )
+	// Try to instantiate via the specified service
+	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 );
+		obj = mlt_repository_fetch( producers, 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 );
+		}
 	}
 	return obj;
 }
@@ -124,12 +169,22 @@ mlt_producer mlt_factory_producer( char *service, void *input )
 /** Fetch a filter from the repository.
 */
 
-mlt_filter mlt_factory_filter( char *service, void *input )
+mlt_filter mlt_factory_filter( const char *service, void *input )
 {
-	mlt_filter obj = mlt_repository_fetch( filters, service, input );
+	mlt_filter obj = NULL;
+
+	// Offer the application the chance to 'create'
+	mlt_events_fire( event_object, "filter-create-request", service, input, &obj, NULL );
+
+	if ( obj == NULL )
+	{
+   		obj = mlt_repository_fetch( filters, 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 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 );
@@ -140,12 +195,22 @@ mlt_filter mlt_factory_filter( char *service, void *input )
 /** Fetch a transition from the repository.
 */
 
-mlt_transition mlt_factory_transition( char *service, void *input )
+mlt_transition mlt_factory_transition( const char *service, void *input )
 {
-	mlt_transition obj = mlt_repository_fetch( transitions, service, input );
+	mlt_transition obj = NULL;
+
+	// Offer the application the chance to 'create'
+	mlt_events_fire( event_object, "transition-create-request", service, input, &obj, NULL );
+
+	if ( obj == NULL )
+	{
+   		obj = mlt_repository_fetch( transitions, 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 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 );
@@ -156,21 +221,31 @@ mlt_transition mlt_factory_transition( char *service, void *input )
 /** Fetch a consumer from the repository
 */
 
-mlt_consumer mlt_factory_consumer( char *service, void *input )
+mlt_consumer mlt_factory_consumer( const char *service, void *input )
 {
 	mlt_consumer obj = NULL;
 
 	if ( service == NULL )
 		service = mlt_environment( "MLT_CONSUMER" );
 
-	obj = mlt_repository_fetch( consumers, service, input );
+	// Offer the application the chance to 'create'
+	mlt_events_fire( event_object, "consumer-create-request", service, input, &obj, NULL );
+
+	if ( obj == NULL )
+	{
+		obj = mlt_repository_fetch( consumers, service, input );
+		mlt_events_fire( event_object, "consumer-create-done", service, input, obj, NULL );
+	}
 
 	if ( obj != NULL )
 	{
-		mlt_properties properties = mlt_consumer_properties( obj );
+		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;
 }
@@ -192,6 +267,7 @@ void mlt_factory_close( )
 {
 	if ( mlt_prefix != NULL )
 	{
+		mlt_properties_close( event_object );
 		mlt_repository_close( producers );
 		mlt_repository_close( filters );
 		mlt_repository_close( transitions );