X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_playlist.c;h=ddb84a389a09cb581a021388476b1d310caef5e2;hb=df833610f58161f108b0c1f98c1e3705731e42ff;hp=0433a743779b084bbafa0c415e5c148cd6e2d54e;hpb=c6002a5b45d686c42db3bd0ae97eb3b64f394fac;p=melted

diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c
index 0433a74..ddb84a3 100644
--- a/src/framework/mlt_playlist.c
+++ b/src/framework/mlt_playlist.c
@@ -263,6 +263,19 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer source,
 	// Fetch the cuts parent properties
 	parent = MLT_PRODUCER_PROPERTIES( mlt_producer_cut_parent( producer ) );
 
+	// Remove fezzik normalisers for fx cuts
+	if ( mlt_properties_get_int( parent, "meta.fx_cut" ) )
+	{
+		mlt_service service = MLT_PRODUCER_SERVICE( mlt_producer_cut_parent( producer ) );
+		mlt_filter filter = mlt_service_filter( service, 0 );
+		while ( filter != NULL && mlt_properties_get_int( MLT_FILTER_PROPERTIES( filter ), "_fezzik" ) )
+		{
+			mlt_service_detach( service, filter );
+			filter = mlt_service_filter( service, 0 );
+		}
+		mlt_properties_set_int( MLT_PRODUCER_PROPERTIES( producer ), "meta.fx_cut", 1 );
+	}
+
 	// Check that we have room
 	if ( this->count >= this->size )
 	{
@@ -1438,7 +1451,22 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 	}
 
 	// Get the frame
-	mlt_service_get_frame( real, frame, index );
+	if ( !mlt_properties_get_int( MLT_SERVICE_PROPERTIES( real ), "meta.fx_cut" ) )
+	{
+		mlt_service_get_frame( real, frame, index );
+	}
+	else
+	{
+		mlt_producer parent = mlt_producer_cut_parent( ( mlt_producer )real );
+		*frame = mlt_frame_init( );
+		mlt_properties_set_int( MLT_FRAME_PROPERTIES( *frame ), "fx_cut", 1 );
+		mlt_frame_push_service( *frame, NULL );
+		mlt_frame_push_audio( *frame, NULL );
+		mlt_service_apply_filters( parent, *frame, 0 );
+		mlt_service_apply_filters( real, *frame, 0 );
+		mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( *frame ) );
+		mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( *frame ) );
+	}
 
 	// Check if we're at the end of the clip
 	mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );