X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fframework%2Fmlt_service.c;h=362f3cc8d927e12f01a808af90d29fec14d3d0d9;hb=14a6dfabee044ad58d4ee2579b25d071d02588ec;hp=87252a6180297c8e7ef040a05cc017cf0121758f;hpb=2a800ec4c840132c7a629b764b673dce09771637;p=mlt

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index 87252a61..362f3cc8 100644
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "mlt_service.h"
+#include "mlt_filter.h"
 #include "mlt_frame.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -44,6 +45,9 @@ typedef struct
 	int count;
 	mlt_service *in;
 	mlt_service out;
+	int filter_count;
+	int filter_size;
+	mlt_filter *filters;
 }
 mlt_service_base;
 
@@ -53,26 +57,46 @@ mlt_service_base;
 static void mlt_service_disconnect( mlt_service this );
 static void mlt_service_connect( mlt_service this, mlt_service that );
 static int service_get_frame( mlt_service this, mlt_frame_ptr frame, int index );
+static void mlt_service_property_changed( mlt_listener, mlt_properties owner, mlt_service this, void **args );
 
 /** Constructor
 */
 
 int mlt_service_init( mlt_service this, void *child )
 {
+	int error = 0;
+
 	// Initialise everything to NULL
 	memset( this, 0, sizeof( struct mlt_service_s ) );
 
 	// Assign the child
 	this->child = child;
 
-	// Generate private space
-	this->private = calloc( sizeof( mlt_service_base ), 1 );
+	// Generate local space
+	this->local = calloc( sizeof( mlt_service_base ), 1 );
 
 	// Associate the methods
 	this->get_frame = service_get_frame;
 	
 	// Initialise the properties
-	return mlt_properties_init( &this->parent, this );
+	error = mlt_properties_init( &this->parent, this );
+	if ( error == 0 )
+	{
+		this->parent.close = ( mlt_destructor )mlt_service_close;
+		this->parent.close_object = this;
+
+		mlt_events_init( &this->parent );
+		mlt_events_register( &this->parent, "service-changed", NULL );
+		mlt_events_register( &this->parent, "property-changed", ( mlt_transmitter )mlt_service_property_changed );
+	}
+
+	return error;
+}
+
+static void mlt_service_property_changed( mlt_listener listener, mlt_properties owner, mlt_service this, void **args )
+{
+	if ( listener != NULL )
+		listener( owner, this, ( char * )args[ 0 ] );
 }
 
 /** Connect a producer service.
@@ -87,7 +111,7 @@ int mlt_service_connect_producer( mlt_service this, mlt_service producer, int in
 	int i = 0;
 
 	// Get the service base
-	mlt_service_base *base = this->private;
+	mlt_service_base *base = this->local;
 
 	// Check if the producer is already registered with this service
 	for ( i = 0; i < base->count; i ++ )
@@ -110,6 +134,13 @@ int mlt_service_connect_producer( mlt_service this, mlt_service producer, int in
 	// If we have space, assign the input
 	if ( base->in != NULL && index >= 0 && index < base->size )
 	{
+		// Get the current service
+		mlt_service current = base->in[ index ];
+
+		// Increment the reference count on this producer
+		if ( producer != NULL )
+			mlt_properties_inc_ref( mlt_service_properties( producer ) );
+
 		// Now we disconnect the producer service from its consumer
 		mlt_service_disconnect( producer );
 		
@@ -123,6 +154,9 @@ int mlt_service_connect_producer( mlt_service this, mlt_service producer, int in
 		// Now we connect the producer to its connected consumer
 		mlt_service_connect( producer, this );
 
+		// Close the current service
+		mlt_service_close( current );
+
 		// Inform caller that all went well
 		return 0;
 	}
@@ -136,24 +170,54 @@ int mlt_service_connect_producer( mlt_service this, mlt_service producer, int in
 */
 
 static void mlt_service_disconnect( mlt_service this )
+{
+	if ( this != NULL )
+	{
+		// Get the service base
+		mlt_service_base *base = this->local;
+
+		// Disconnect
+		base->out = NULL;
+	}
+}
+
+/** Obtain the consumer this service is connected to.
+*/
+
+mlt_service mlt_service_consumer( mlt_service this )
 {
 	// Get the service base
-	mlt_service_base *base = this->private;
+	mlt_service_base *base = this->local;
 
-	// There's a bit more required here...
-	base->out = NULL;
+	// Return the connected consumer
+	return base->out;
 }
 
-/** Associate this service to the its consumer.
+/** Obtain the producer this service is connected to.
 */
 
-static void mlt_service_connect( mlt_service this, mlt_service that )
+mlt_service mlt_service_producer( mlt_service this )
 {
 	// Get the service base
-	mlt_service_base *base = this->private;
+	mlt_service_base *base = this->local;
 
-	// There's a bit more required here...
-	base->out = that;
+	// Return the connected producer
+	return base->count > 0 ? base->in[ base->count - 1 ] : NULL;
+}
+
+/** Associate this service to the consumer.
+*/
+
+static void mlt_service_connect( mlt_service this, mlt_service that )
+{
+	if ( this != NULL )
+	{
+		// Get the service base
+		mlt_service_base *base = this->local;
+
+		// There's a bit more required here...
+		base->out = that;
+	}
 }
 
 /** Get the first connected producer service.
@@ -164,7 +228,7 @@ mlt_service mlt_service_get_producer( mlt_service this )
 	mlt_service producer = NULL;
 
 	// Get the service base
-	mlt_service_base *base = this->private;
+	mlt_service_base *base = this->local;
 
 	if ( base->in != NULL )
 		producer = base->in[ 0 ];
@@ -177,7 +241,7 @@ mlt_service mlt_service_get_producer( mlt_service this )
 
 static int service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 {
-	mlt_service_base *base = this->private;
+	mlt_service_base *base = this->local;
 	if ( index < base->count )
 	{
 		mlt_service producer = base->in[ index ];
@@ -188,12 +252,165 @@ static int service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 	return 0;
 }
 
+/** Return the properties object.
+*/
+
+mlt_properties mlt_service_properties( mlt_service self )
+{
+	return self != NULL ? &self->parent : NULL;
+}
+
+/** Recursively apply attached filters
+*/
+
+void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
+{
+	int i;
+	mlt_properties frame_properties = mlt_frame_properties( frame );
+	mlt_properties filter_properties = mlt_service_properties( this );
+	mlt_service_base *base = this->local;
+	mlt_position position = mlt_frame_get_position( frame );
+	mlt_position this_in = mlt_properties_get_position( filter_properties, "in" );
+
+	// Hmm - special case for cuts - apply filters from the parent first
+	if ( mlt_properties_get_int( filter_properties, "_cut" ) )
+	{
+		position -= this_in;
+		mlt_frame_set_position( frame, position );
+		mlt_service_apply_filters( ( mlt_service )mlt_properties_get_data( filter_properties, "_cut_parent", NULL ), frame, 0 );
+	}
+
+	if ( index == 0 || mlt_properties_get_int( filter_properties, "_filter_private" ) == 0 )
+	{
+		// Process the frame with the attached filters
+		for ( i = 0; i < base->filter_count; i ++ )
+		{
+			if ( base->filters[ i ] != NULL )
+			{
+				mlt_properties properties = mlt_filter_properties( base->filters[ i ] );
+				mlt_position in = mlt_filter_get_in( base->filters[ i ] );
+				mlt_position out = mlt_filter_get_out( base->filters[ i ] );
+				if ( ( in == 0 && out == 0 ) || ( position >= in && ( position <= out || out == 0 ) ) )
+				{
+					mlt_frame_set_position( frame, position - in );
+					mlt_filter_process( base->filters[ i ], frame );
+					mlt_service_apply_filters( mlt_filter_service( base->filters[ i ] ), frame, index + 1 );
+					mlt_frame_set_position( frame, position + in );
+				}
+			}
+		}
+	}
+
+	if ( mlt_properties_get_int( filter_properties, "_cut" ) )
+		mlt_frame_set_position( frame, position + this_in );
+}
+
 /** Obtain a frame.
 */
 
 int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 {
-	return this->get_frame( this, frame, index );
+	if ( this != NULL )
+	{
+		int result = this->get_frame( this, frame, index );
+		if ( result == 0 )
+			mlt_service_apply_filters( this, *frame, 1 );
+		return result;
+	}
+	*frame = mlt_frame_init( );
+	return 0;
+}
+
+static void mlt_service_filter_changed( mlt_service owner, mlt_service this )
+{
+	mlt_events_fire( mlt_service_properties( this ), "service-changed", NULL );
+}
+
+/** Attach a filter.
+*/
+
+int mlt_service_attach( mlt_service this, mlt_filter filter )
+{
+	int error = this == NULL || filter == NULL;
+	if ( error == 0 )
+	{
+		int i = 0;
+		mlt_properties properties = mlt_service_properties( this );
+		mlt_service_base *base = this->local;
+
+		for ( i = 0; error == 0 && i < base->filter_count; i ++ )
+			if ( base->filters[ i ] == filter )
+				error = 1;
+
+		if ( error == 0 )
+		{
+			if ( base->filter_count == base->filter_size )
+			{
+				base->filter_size += 10;
+				base->filters = realloc( base->filters, base->filter_size * sizeof( mlt_filter ) );
+			}
+
+			if ( base->filters != NULL )
+			{
+				mlt_properties props = mlt_filter_properties( filter );
+				mlt_properties_inc_ref( mlt_filter_properties( filter ) );
+				base->filters[ base->filter_count ++ ] = filter;
+				mlt_events_fire( properties, "service-changed", NULL );
+				mlt_events_listen( props, this, "service-changed", ( mlt_listener )mlt_service_filter_changed );
+				mlt_events_listen( props, this, "property-changed", ( mlt_listener )mlt_service_filter_changed );
+			}
+			else
+			{
+				error = 2;
+			}
+		}
+	}
+	return error;
+}
+
+/** Detach a filter.
+*/
+
+int mlt_service_detach( mlt_service this, mlt_filter filter )
+{
+	int error = this == NULL || filter == NULL;
+	if ( error == 0 )
+	{
+		int i = 0;
+		mlt_service_base *base = this->local;
+		mlt_properties properties = mlt_service_properties( this );
+
+		for ( i = 0; i < base->filter_count; i ++ )
+			if ( base->filters[ i ] == filter )
+				break;
+
+		if ( i < base->filter_count )
+		{
+			base->filters[ i ] = NULL;
+			for ( i ++ ; i < base->filter_count; i ++ )
+				base->filters[ i - 1 ] = base->filters[ i ];
+			base->filter_count --;
+			mlt_events_disconnect( mlt_filter_properties( filter ), this );
+			mlt_filter_close( filter );
+			mlt_events_fire( properties, "service-changed", NULL );
+		}
+	}
+	return error;
+}
+
+/** Retrieve a filter.
+*/
+
+mlt_filter mlt_service_filter( mlt_service this, int index )
+{
+	mlt_filter filter = NULL;
+	if ( this != NULL )
+	{
+		mlt_service_base *base = this->local;
+		if ( index >= 0 && index < base->filter_count )
+			filter = base->filters[ index ];
+	}
+	return filter;
 }
 
 /** Close the service.
@@ -201,9 +418,29 @@ int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 
 void mlt_service_close( mlt_service this )
 {
-	mlt_service_base *base = this->private;
-	free( base->in );
-	free( base );
-	mlt_properties_close( &this->parent );
+	if ( this != NULL && mlt_properties_dec_ref( mlt_service_properties( this ) ) <= 0 )
+	{
+		if ( this->close != NULL )
+		{
+			this->close( this->close_object );
+		}
+		else
+		{
+			mlt_service_base *base = this->local;
+			int i = 0;
+			int count = base->filter_count;
+			mlt_events_block( mlt_service_properties( this ), this );
+			while( count -- )
+				mlt_service_detach( this, base->filters[ 0 ] );
+			free( base->filters );
+			for ( i = 0; i < base->count; i ++ )
+				if ( base->in[ i ] != NULL )
+					mlt_service_close( base->in[ i ] );
+			this->parent.close = NULL;
+			free( base->in );
+			free( base );
+			mlt_properties_close( &this->parent );
+		}
+	}
 }