Producer filter attach/detach methods; major rework on westley consumer, minor on...

[melted] / src / framework / mlt_tractor.c

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 783cf55..5b571be 100644 (file)
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -41,11 +41,8 @@ struct mlt_tractor_s
 */
 
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int track );
-static void producer_close( mlt_producer this );
 
 /** Constructor for the tractor.
-
-       TODO: thread this service...
 */
 
 mlt_tractor mlt_tractor_init( )
@@ -61,7 +58,8 @@ mlt_tractor mlt_tractor_init( )
                        mlt_properties_set( mlt_producer_properties( producer ), "mlt_service", "tractor" );
 
                        producer->get_frame = producer_get_frame;
-                       producer->close = producer_close;
+                       producer->close = ( mlt_destructor )mlt_tractor_close;
+                       producer->close_object = this;
                }
                else
                {
@@ -85,7 +83,7 @@ mlt_service mlt_tractor_service( mlt_tractor this )
 
 mlt_producer mlt_tractor_producer( mlt_tractor this )
 {
-       return &this->parent;
+       return this != NULL ? &this->parent : NULL;
 }
 
 /** Get the properties object associated to the tractor.
@@ -119,7 +117,6 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
        mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL );
        mlt_properties_set_int( properties, "width", *width );
        mlt_properties_set_int( properties, "height", *height );
-       mlt_properties_inherit( properties, mlt_frame_properties( frame ) );
        return 0;
 }
 
@@ -127,6 +124,7 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma
 {
        mlt_properties properties = mlt_frame_properties( this );
        mlt_frame frame = mlt_frame_pop_audio( this );
+       mlt_properties_inherit( mlt_frame_properties( frame ), properties );
        mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
        mlt_properties_set_data( properties, "audio", *buffer, 0, NULL, NULL );
        mlt_properties_set_int( properties, "frequency", *frequency );
@@ -220,6 +218,8 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
                                mlt_properties_inherit( mlt_frame_properties( *frame ), mlt_frame_properties( video ) );
                        }
 
+                       mlt_properties_set_int( mlt_frame_properties( *frame ), "test_audio", audio == NULL );
+                       mlt_properties_set_int( mlt_frame_properties( *frame ), "test_image", video == NULL );
                }
                else if ( producer != NULL )
                {
@@ -252,16 +252,11 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 
 void mlt_tractor_close( mlt_tractor this )
 {
-       this->parent.close = NULL;
-       mlt_producer_close( &this->parent );
-       free( this );
-}
-
-/** Close the producer.
-*/
-
-static void producer_close( mlt_producer this )
-{
-       mlt_tractor_close( this->child );
+       if ( this != NULL && mlt_properties_dec_ref( mlt_tractor_properties( this ) ) <= 0 )
+       {
+               this->parent.close = NULL;
+               mlt_producer_close( &this->parent );
+               free( this );
+       }
 }