Corrects cuts with filters

[melted] / src / modules / westley / consumer_westley.c

diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c
index 35afa6e..5b43208 100644 (file)
--- a/src/modules/westley/consumer_westley.c
+++ b/src/modules/westley/consumer_westley.c
@@ -236,12 +236,13 @@ static inline void serialise_service_filters( serialise_context context, mlt_ser
 static void serialise_producer( serialise_context context, mlt_service service, xmlNode *node )
 {
        xmlNode *child = node;
-       mlt_properties properties = mlt_service_properties( service );
+       mlt_service parent = MLT_SERVICE( mlt_producer_cut_parent( MLT_PRODUCER( service ) ) );
        
        if ( context->pass == 0 )
        {
+               mlt_properties properties = mlt_service_properties( parent );
                // Get a new id - if already allocated, do nothing
-               char *id = westley_get_id( context, service, westley_producer );
+               char *id = westley_get_id( context, parent, westley_producer );
                if ( id == NULL )
                        return;
 
@@ -259,9 +260,11 @@ static void serialise_producer( serialise_context context, mlt_service service,
        }
        else
        {
-               // Get a new id - if already allocated, do nothing
-               char *id = westley_get_id( context, service, westley_existing );
-               xmlNewProp( node, "producer", id );
+               char *id = westley_get_id( context, parent, westley_existing );
+               mlt_properties properties = mlt_service_properties( service );
+               xmlNewProp( node, "parent", id );
+               xmlNewProp( node, "in", mlt_properties_get( properties, "in" ) );
+               xmlNewProp( node, "out", mlt_properties_get( properties, "out" ) );
        }
 }
 
@@ -288,9 +291,17 @@ static void serialise_multitrack( serialise_context context, mlt_service service
                        xmlNode *track = xmlNewChild( node, NULL, "track", NULL );
                        int hide = 0;
                        mlt_producer producer = mlt_multitrack_track( MLT_MULTITRACK( service ), i );
+                       mlt_properties properties = mlt_producer_properties( producer );
+
+                       mlt_service parent = MLT_SERVICE( mlt_producer_cut_parent( producer ) );
 
-                       char *id = westley_get_id( context, MLT_SERVICE( producer ), westley_existing );
+                       char *id = westley_get_id( context, MLT_SERVICE( parent ), westley_existing );
                        xmlNewProp( track, "producer", id );
+                       if ( mlt_properties_get_int( properties, "cut" ) == 1 )
+                       {
+                               xmlNewProp( track, "in", mlt_properties_get( properties, "in" ) );
+                               xmlNewProp( track, "out", mlt_properties_get( properties, "out" ) );
+                       }
                        
                        hide = mlt_properties_get_int( context->hide_map, id );
                        if ( hide )
@@ -323,19 +334,20 @@ static void serialise_playlist( serialise_context context, mlt_service service,
                        {
                                if ( info.producer != NULL )
                                {
-                                       char *service_s = mlt_properties_get( mlt_producer_properties( info.producer ), "mlt_service" );
-                                       char *resource_s = mlt_properties_get( mlt_producer_properties( info.producer ), "resource" );
+                                       mlt_producer producer = mlt_producer_cut_parent( info.producer );
+                                       char *service_s = mlt_properties_get( mlt_producer_properties( producer ), "mlt_service" );
+                                       char *resource_s = mlt_properties_get( mlt_producer_properties( producer ), "resource" );
                                        if ( resource_s != NULL && !strcmp( resource_s, "<tractor>" ) )
                                        {
-                                               serialise_tractor( context, MLT_SERVICE( info.producer ), node );
+                                               serialise_tractor( context, MLT_SERVICE( producer ), node );
                                                context->pass ++;
-                                               serialise_tractor( context, MLT_SERVICE( info.producer ), node );
+                                               serialise_tractor( context, MLT_SERVICE( producer ), node );
                                                context->pass --;
                                        }
                                        else if ( service_s != NULL && strcmp( service_s, "blank" ) != 0 )
-                                               serialise_service( context, MLT_SERVICE( info.producer ), node );
+                                               serialise_service( context, MLT_SERVICE( producer ), node );
                                        else if ( resource_s != NULL && !strcmp( resource_s, "<playlist>" ) )
-                                               serialise_playlist( context, MLT_SERVICE( info.producer ), node );
+                                               serialise_playlist( context, MLT_SERVICE( producer ), node );
                                }
                        }
                }
@@ -353,7 +365,8 @@ static void serialise_playlist( serialise_context context, mlt_service service,
                {
                        if ( ! mlt_playlist_get_clip_info( MLT_PLAYLIST( service ), &info, i ) )
                        {
-                               char *service_s = mlt_properties_get( mlt_producer_properties( info.producer ), "mlt_service" );
+                               mlt_producer producer = mlt_producer_cut_parent( info.producer );
+                               char *service_s = mlt_properties_get( mlt_producer_properties( producer ), "mlt_service" );
                                if ( service_s != NULL && strcmp( service_s, "blank" ) == 0 )
                                {
                                        char length[ 20 ];
@@ -366,12 +379,14 @@ static void serialise_playlist( serialise_context context, mlt_service service,
                                {
                                        char temp[ 20 ];
                                        xmlNode *entry = xmlNewChild( child, NULL, "entry", NULL );
-                                       id = westley_get_id( context, MLT_SERVICE( info.producer ), westley_existing );
+                                       id = westley_get_id( context, MLT_SERVICE( producer ), westley_existing );
                                        xmlNewProp( entry, "producer", id );
                                        sprintf( temp, "%d", info.frame_in );
                                        xmlNewProp( entry, "in", temp );
                                        sprintf( temp, "%d", info.frame_out );
                                        xmlNewProp( entry, "out", temp );
+                                       if ( mlt_producer_is_cut( info.cut ) )
+                                               serialise_service_filters( context, mlt_producer_service( info.cut ), entry );
                                }
                        }
                }