producer_avformat.c: add support for AVOptions as properties.

[melted] / src / modules / core / transition_mix.c

diff --git a/src/modules/core/transition_mix.c b/src/modules/core/transition_mix.c
index 1dfda2e..b2b3790 100644 (file)
--- a/src/modules/core/transition_mix.c
+++ b/src/modules/core/transition_mix.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "transition_mix.h"
+#include <framework/mlt_transition.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
@@ -104,14 +104,17 @@ static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt
                        mlt_properties_set_double( b_props, "audio.mix", mix );
        
                        // Initialise transition previous mix value to prevent an inadvertant jump from 0
-                       if ( mlt_properties_get( properties, "previous_mix" ) == NULL )
-                               mlt_properties_set_double( properties, "previous_mix", mlt_properties_get_double( b_props, "audio.mix" ) );
+                       mlt_position last_position = mlt_properties_get_position( properties, "_last_position" );
+                       mlt_position current_position = mlt_frame_get_position( b_frame );
+                       if ( mlt_properties_get( properties, "_previous_mix" ) == NULL
+                            || current_position != last_position + 1 )
+                               mlt_properties_set_double( properties, "_previous_mix", mix );
                                
                        // Tell b frame what the previous mix level was
-                       mlt_properties_set_double( b_props, "audio.previous_mix", mlt_properties_get_double( properties, "previous_mix" ) );
+                       mlt_properties_set_double( b_props, "audio.previous_mix", mlt_properties_get_double( properties, "_previous_mix" ) );
 
                        // Save the current mix level for the next iteration
-                       mlt_properties_set_double( properties, "previous_mix", mlt_properties_get_double( b_props, "audio.mix" ) );
+                       mlt_properties_set_double( properties, "_previous_mix", mlt_properties_get_double( b_props, "audio.mix" ) );
                
                        mlt_properties_set_double( b_props, "audio.reverse", mlt_properties_get_double( properties, "reverse" ) );
                }
@@ -150,7 +153,7 @@ static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt
 /** Constructor for the transition.
 */
 
-mlt_transition transition_mix_init( char *arg )
+mlt_transition transition_mix_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        mlt_transition this = calloc( sizeof( struct mlt_transition_s ), 1 );
        if ( this != NULL && mlt_transition_init( this, NULL ) == 0 )