Remaining audio handling switched to stacks; Minor corrections to compositing and...

[mlt] / src / modules / jackrack / filter_jackrack.c

diff --git a/src/modules/jackrack/filter_jackrack.c b/src/modules/jackrack/filter_jackrack.c
index 37c75da6e7d2a57ff3fa9a9ed2455900f15dbc6f..a8803c82aaea851621d1f98ed034edb1a64c025d 100644 (file)
--- a/src/modules/jackrack/filter_jackrack.c
+++ b/src/modules/jackrack/filter_jackrack.c
@@ -236,9 +236,6 @@ static int jackrack_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        // Get the filter properties
        mlt_properties filter_properties = MLT_FILTER_PROPERTIES( filter );
 
-       // Restore the original get_audio
-       frame->get_audio = mlt_frame_pop_audio( frame );
-       
        int jack_frequency = mlt_properties_get_int( filter_properties, "_sample_rate" );
 
        // Get the producer's audio
@@ -313,12 +310,11 @@ static int jackrack_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
-       if ( frame->get_audio != NULL )
+       if ( mlt_frame_is_test_audio( frame ) != 0 )
        {
                mlt_properties properties = MLT_FILTER_PROPERTIES( this );
-               mlt_frame_push_audio( frame, frame->get_audio );
                mlt_frame_push_audio( frame, this );
-               frame->get_audio = jackrack_get_audio;
+               mlt_frame_push_audio( frame, jackrack_get_audio );
                
                if ( mlt_properties_get_int( properties, "_sync" ) )
                        initialise_jack_ports( properties );