Cut management part 1

[melted] / src / framework / mlt_service.c

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index 9ea9b66..9a0cd77 100644 (file)
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -271,6 +271,10 @@ void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
        mlt_service_base *base = this->local;
        mlt_position position = mlt_properties_get_position( frame_properties, "_position" );
 
+       // Hmm - special case for cuts - apply filters from the parent first
+       if ( mlt_properties_get_int( filter_properties, "_cut" ) )
+               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
@@ -281,12 +285,12 @@ void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
                                mlt_properties properties = mlt_filter_properties( base->filters[ i ] );
                                mlt_position in = mlt_properties_get_position( properties, "in" );
                                mlt_position out = mlt_properties_get_position( properties, "out" );
-                               if ( ( in == 0 && out == 0 ) || ( position >= in && position <= out ) )
+                               if ( ( in == 0 && out == 0 ) || ( position >= in && ( position <= out || out == 0 ) ) )
                                {
-                                       mlt_properties_set_position( frame_properties, "_position", position - in );
                                        mlt_filter_process( base->filters[ i ], frame );
+                                       mlt_properties_set_position( frame_properties, "_position", position - in );
                                        mlt_service_apply_filters( mlt_filter_service( base->filters[ i ] ), frame, index + 1 );
-                                       mlt_properties_set_position( frame_properties, "_position", position + in );
+                                       mlt_properties_set_position( frame_properties, "_position", position );
                                }
                        }
                }