Pointless improvement on a bad filter :-)

[melted] / src / modules / dv / consumer_libdv.c

diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c
index 132cb6d..448c225 100644 (file)
--- a/src/modules/dv/consumer_libdv.c
+++ b/src/modules/dv/consumer_libdv.c
@@ -56,7 +56,7 @@ mlt_consumer consumer_libdv_init( char *arg )
        if ( this != NULL && mlt_consumer_init( this, NULL ) == 0 )
        {
                // Get properties from the consumer
-               mlt_properties properties = mlt_consumer_properties( this );
+               mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
 
                // Assign close callback
                this->close = consumer_close;
@@ -92,7 +92,7 @@ mlt_consumer consumer_libdv_init( char *arg )
 static int consumer_start( mlt_consumer this )
 {
        // Get the properties
-       mlt_properties properties = mlt_consumer_properties( this );
+       mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
 
        // Check that we're not already running
        if ( !mlt_properties_get_int( properties, "running" ) )
@@ -123,7 +123,7 @@ static int consumer_start( mlt_consumer this )
 static int consumer_stop( mlt_consumer this )
 {
        // Get the properties
-       mlt_properties properties = mlt_consumer_properties( this );
+       mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
 
        // Check that we're running
        if ( mlt_properties_get_int( properties, "running" ) )
@@ -151,7 +151,7 @@ static int consumer_stop( mlt_consumer this )
 static int consumer_is_stopped( mlt_consumer this )
 {
        // Get the properties
-       mlt_properties properties = mlt_consumer_properties( this );
+       mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
        return !mlt_properties_get_int( properties, "running" );
 }
 
@@ -161,7 +161,7 @@ static int consumer_is_stopped( mlt_consumer this )
 static dv_encoder_t *libdv_get_encoder( mlt_consumer this, mlt_frame frame )
 {
        // Get the properties of the consumer
-       mlt_properties this_properties = mlt_consumer_properties( this );
+       mlt_properties this_properties = MLT_CONSUMER_PROPERTIES( this );
 
        // Obtain the dv_encoder
        dv_encoder_t *encoder = mlt_properties_get_data( this_properties, "dv_encoder", NULL );
@@ -200,13 +200,13 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
        dv_encoder_t *encoder = libdv_get_encoder( this, frame );
 
        // Get the properties of the consumer
-       mlt_properties this_properties = mlt_consumer_properties( this );
+       mlt_properties this_properties = MLT_CONSUMER_PROPERTIES( this );
 
        // This will hold the size of the dv frame
        int size = 0;
 
        // Is the image rendered
-       int rendered = mlt_properties_get_int( mlt_frame_properties( frame ), "rendered" );
+       int rendered = mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "rendered" );
 
        // Get width and height
        int width = mlt_properties_get_int( this_properties, "width" );
@@ -220,6 +220,7 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
                uint8_t *image = NULL;
 
                // Get the image
+               mlt_events_fire( this_properties, "consumer-frame-show", frame, NULL );
                mlt_frame_get_image( frame, &image, &fmt, &width, &height, 0 );
 
                // Check that we get what we expected
@@ -259,10 +260,10 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
 static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_frame frame )
 {
        // Get the properties of the consumer
-       mlt_properties this_properties = mlt_consumer_properties( this );
+       mlt_properties this_properties = MLT_CONSUMER_PROPERTIES( this );
 
        // Get the properties of the frame
-       mlt_properties frame_properties = mlt_frame_properties( frame );
+       mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
 
        // Obtain the dv_encoder
        dv_encoder_t *encoder = libdv_get_encoder( this, frame );
@@ -334,7 +335,7 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra
 static void consumer_output( mlt_consumer this, uint8_t *dv_frame, int size, mlt_frame frame )
 {
        // Get the properties
-       mlt_properties properties = mlt_consumer_properties( this );
+       mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
 
        FILE *output = stdout;
        char *target = mlt_properties_get( properties, "target" );
@@ -370,7 +371,10 @@ static void *consumer_thread( void *arg )
        mlt_consumer this = arg;
 
        // Get the properties
-       mlt_properties properties = mlt_consumer_properties( this );
+       mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );
+
+       // Get the terminate_on_pause property
+       int top = mlt_properties_get_int( properties, "terminate_on_pause" );
 
        // Get the handling methods
        int ( *video )( mlt_consumer, uint8_t *, mlt_frame ) = mlt_properties_get_data( properties, "video", NULL );
@@ -393,6 +397,13 @@ static void *consumer_thread( void *arg )
                // Check that we have a frame to work with
                if ( frame != NULL )
                {
+                       // Terminate on pause
+                       if ( top && mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0 )
+                       {
+                               mlt_frame_close( frame );
+                               break;
+                       }
+
                        // Obtain the dv_encoder
                        if ( libdv_get_encoder( this, frame ) != NULL )
                        {
@@ -419,6 +430,8 @@ static void *consumer_thread( void *arg )
        // Tidy up
        mlt_pool_release( dv_frame );
 
+       mlt_consumer_stopped( this );
+
        return NULL;
 }