X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_service.c;h=d120d28e3c58c4f47fb33677df0c1593e66c628d;hb=eabc3498604fc7983bbd805d40dad2e7df135f17;hp=36f79e0515d926ccfbe42237e57b93aa73a21ec1;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index 36f79e0..d120d28 100644
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -124,19 +124,16 @@ mlt_service_type mlt_service_identify( mlt_service this )
 		char *resource = mlt_properties_get( properties, "resource" );
 		if ( mlt_type == NULL )
 			type = unknown_type;
+		else if ( resource == NULL || !strcmp( resource, "<producer>" ) )
+			type = producer_type;
+		else if ( !strcmp( resource, "<playlist>" ) )
+			type = playlist_type;
+		else if ( !strcmp( resource, "<tractor>" ) )
+			type = tractor_type;
+		else if ( !strcmp( resource, "<multitrack>" ) )
+			type = multitrack_type;
 		else if ( !strcmp( mlt_type, "producer" ) )
 			type = producer_type;
-		else if ( !strcmp( mlt_type, "mlt_producer" ) )
-		{
-			if ( resource == NULL || !strcmp( resource, "<producer>" ) )
-				type = producer_type;
-			else if ( !strcmp( resource, "<playlist>" ) )
-				type = playlist_type;
-			else if ( !strcmp( resource, "<tractor>" ) )
-				type = tractor_type;
-			else if ( !strcmp( resource, "<multitrack>" ) )
-				type = multitrack_type;
-		}
 		else if ( !strcmp( mlt_type, "filter" ) )
 			type = filter_type;
 		else if ( !strcmp( mlt_type, "transition" ) )
@@ -163,6 +160,11 @@ int mlt_service_connect_producer( mlt_service this, mlt_service producer, int in
 	// Get the service base
 	mlt_service_base *base = this->local;
 
+	// Special case 'track' index - only works for last filter(s) in a particular chain
+	// but allows a filter to apply to the output frame regardless of which track it comes from
+	if ( index == -1 )
+		index = 0;
+
 	// Check if the producer is already registered with this service
 	for ( i = 0; i < base->count; i ++ )
 		if ( base->in[ i ] == producer )
@@ -336,7 +338,8 @@ void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
 			{
 				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 ) ) )
+				int disable = mlt_properties_get_int( MLT_FILTER_PROPERTIES( base->filters[ i ] ), "disable" );
+				if ( !disable && ( ( in == 0 && out == 0 ) || ( position >= in && ( position <= out || out == 0 ) ) ) )
 				{
 					mlt_properties_set_position( frame_properties, "in", in == 0 ? this_in : in );
 					mlt_properties_set_position( frame_properties, "out", out == 0 ? this_out : out );
@@ -353,18 +356,26 @@ void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
 
 int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 {
+	int result = 0;
+
+	// Lock the service
 	mlt_service_lock( this );
+
+	// Ensure that the frame is NULL
+	*frame = NULL;
+
+	// Only process if we have a valid service
 	if ( this != NULL && this->get_frame != NULL )
 	{
-		int result = 0;
 		mlt_properties properties = MLT_SERVICE_PROPERTIES( this );
 		mlt_position in = mlt_properties_get_position( properties, "in" );
 		mlt_position out = mlt_properties_get_position( properties, "out" );
-		mlt_properties_inc_ref( properties );
-		mlt_service_unlock( this );
+
 		result = this->get_frame( this, frame, index );
+
 		if ( result == 0 )
 		{
+			mlt_properties_inc_ref( properties );
 			properties = MLT_FRAME_PROPERTIES( *frame );
 			if ( in >=0 && out > 0 )
 			{
@@ -374,15 +385,16 @@ int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 			mlt_service_apply_filters( this, *frame, 1 );
 			mlt_deque_push_back( MLT_FRAME_SERVICE_STACK( *frame ), this );
 		}
-		else
-		{
-			mlt_service_close( this );
-		}
-		return result;
 	}
+
+	// Make sure we return a frame
+	if ( *frame == NULL )
+		*frame = mlt_frame_init( );
+
+	// Unlock the service
 	mlt_service_unlock( this );
-	*frame = mlt_frame_init( );
-	return 0;
+
+	return result;
 }
 
 static void mlt_service_filter_changed( mlt_service owner, mlt_service this )