X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_service.c;h=362f3cc8d927e12f01a808af90d29fec14d3d0d9;hb=0486280ed87912e4ee9c1103c8ace19fa322a4af;hp=0851b9ae52b8496efdb6dd966ec543a6507bb2f4;hpb=363d095af9149cc181e92a35d2e34e583d061747;p=melted

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index 0851b9a..362f3cc 100644
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -86,6 +86,7 @@ int mlt_service_init( mlt_service this, void *child )
 		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 );
 	}
 
@@ -262,24 +263,46 @@ mlt_properties mlt_service_properties( mlt_service self )
 /** Recursively apply attached filters
 */
 
-static void apply_filters( mlt_service this, mlt_frame frame, int index )
+void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
 {
-	mlt_properties properties = mlt_service_properties( this );
-	mlt_service_base *base = this->local;
 	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 ( mlt_properties_get_int( properties, "_filter_private" ) == 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_filter_process( base->filters[ i ], frame );
-				apply_filters( mlt_filter_service( base->filters[ i ] ), frame, index );
+				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.
@@ -291,13 +314,18 @@ int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 	{
 		int result = this->get_frame( this, frame, index );
 		if ( result == 0 )
-			apply_filters( this, *frame, index );
+			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.
 */
 
@@ -324,9 +352,12 @@ int mlt_service_attach( mlt_service this, mlt_filter 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
 			{
@@ -359,6 +390,7 @@ int mlt_service_detach( mlt_service this, mlt_filter filter )
 			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 );
 		}
@@ -397,6 +429,7 @@ void mlt_service_close( mlt_service this )
 			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 );