relay first nested consumer's frame-show event instead of own

diff --git a/src/modules/core/consumer_multi.c b/src/modules/core/consumer_multi.c
index 071591b1e9ac87bfc6d6994d77cf9bbd2470bb5b..653547e0d88a600078afedd673687c7793a5d6c5 100644 (file)
--- a/src/modules/core/consumer_multi.c
+++ b/src/modules/core/consumer_multi.c
@@ -137,6 +137,11 @@ static void attach_normalisers( mlt_profile profile, mlt_service service )
        create_filter( profile, service, "audioconvert", &created );
 }
 
+static void on_frame_show( void *dummy, mlt_properties properties, mlt_frame frame )
+{
+       mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
+}
+
 static mlt_consumer generate_consumer( mlt_consumer consumer, mlt_properties props, int index )
 {
        mlt_profile profile = NULL;
@@ -166,6 +171,14 @@ static mlt_consumer generate_consumer( mlt_consumer consumer, mlt_properties pro
                mlt_properties_inherit( nested_props, props );
 
                attach_normalisers( profile, MLT_CONSUMER_SERVICE(nested) );
+
+               // Relay the first available consumer-frame-show event
+               mlt_event event = mlt_properties_get_data( properties, "frame-show-event", NULL );
+               if ( !event )
+               {
+                       event = mlt_events_listen( nested_props, properties, "consumer-frame-show", (mlt_listener) on_frame_show );
+                       mlt_properties_set_data( properties, "frame-show-event", event, 0, /*mlt_event_close*/ NULL, NULL );
+               }
        }
        else
        {
@@ -505,7 +518,6 @@ static void *consumer_thread( void *arg )
                                if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES(frame), "_speed" ) == 0 )
                                        foreach_consumer_refresh( consumer );
                                foreach_consumer_put( consumer, frame );
-                               mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
                        }
                        else
                        {
@@ -521,7 +533,6 @@ static void *consumer_thread( void *arg )
                        {
                                // Send this termination frame to nested consumers for their cancellation
                                foreach_consumer_put( consumer, frame );
-                               mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
                        }
                        if ( frame )
                                mlt_frame_close( frame );