Transitions reworked (always_active capabilities); remaining audio handling switched...

[melted] / src / framework / mlt_transition.h

diff --git a/src/framework/mlt_transition.h b/src/framework/mlt_transition.h
index e4dd154..9db26b3 100644 (file)
--- a/src/framework/mlt_transition.h
+++ b/src/framework/mlt_transition.h
@@ -44,26 +44,27 @@ struct mlt_transition_s
        mlt_service producer;
        
        // Private
-       mlt_frame a_frame;
-       mlt_frame b_frame;
-       int a_held;
-       int b_held;
+       mlt_frame *frames;
+       int held;
 };
 
 /** Public final methods
 */
 
-extern int mlt_transition_init( mlt_transition this, void *child );
+#define MLT_TRANSITION_SERVICE( transition )           ( &( transition )->parent )
+#define MLT_TRANSITION_PROPERTIES( transition )                MLT_SERVICE_PROPERTIES( MLT_TRANSITION_SERVICE( transition ) )
+
+extern int mlt_transition_init( mlt_transition self, void *child );
 extern mlt_transition mlt_transition_new( );
-extern mlt_service mlt_transition_service( mlt_transition this );
-extern mlt_properties mlt_transition_properties( mlt_transition this );
-extern int mlt_transition_connect( mlt_transition this, mlt_service producer, int a_track, int b_track );
-extern void mlt_transition_set_in_and_out( mlt_transition this, mlt_position in, mlt_position out );
-extern int mlt_transition_get_a_track( mlt_transition this );
-extern int mlt_transition_get_b_track( mlt_transition this );
-extern mlt_position mlt_transition_get_in( mlt_transition this );
-extern mlt_position mlt_transition_get_out( mlt_transition this );
-extern mlt_frame mlt_transition_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame );
-extern void mlt_transition_close( mlt_transition this );
+extern mlt_service mlt_transition_service( mlt_transition self );
+extern mlt_properties mlt_transition_properties( mlt_transition self );
+extern int mlt_transition_connect( mlt_transition self, mlt_service producer, int a_track, int b_track );
+extern void mlt_transition_set_in_and_out( mlt_transition self, mlt_position in, mlt_position out );
+extern int mlt_transition_get_a_track( mlt_transition self );
+extern int mlt_transition_get_b_track( mlt_transition self );
+extern mlt_position mlt_transition_get_in( mlt_transition self );
+extern mlt_position mlt_transition_get_out( mlt_transition self );
+extern mlt_frame mlt_transition_process( mlt_transition self, mlt_frame a_frame, mlt_frame b_frame );
+extern void mlt_transition_close( mlt_transition self );
 
 #endif