X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_transition.h;h=a6222ce83ae180cdd83473b11463dc48830849c5;hb=a2c29b04aabe82b14851b905fca993f9f471bc6b;hp=1686199970e962f781476e7e8f239f5feb5fe44f;hpb=3e0edf239fc98d1180f73ff3ba4a0c1331147fae;p=melted

diff --git a/src/framework/mlt_transition.h b/src/framework/mlt_transition.h
index 1686199..a6222ce 100644
--- a/src/framework/mlt_transition.h
+++ b/src/framework/mlt_transition.h
@@ -28,42 +28,43 @@
 
 struct mlt_transition_s
 {
-	// We're implementing service here
+	/* We're implementing service here */
 	struct mlt_service_s parent;
 
-	// public virtual
+	/* public virtual */
 	void ( *close )( mlt_transition );
 
-	// protected transition method
+	/* protected transition method */
 	mlt_frame ( *process )( mlt_transition, mlt_frame, mlt_frame );
 
-	// Protected
+	/* Protected */
 	void *child;
 	
-	// track and in/out points
+	/* track and in/out points */
 	mlt_service producer;
-	int a_track;
-	int b_track;
-	mlt_timecode in;
-	mlt_timecode out;
 	
-	// Private
-	mlt_frame a_frame;
-	mlt_frame b_frame;
+	/* Private */
+	mlt_frame *frames;
+	int held;
 };
 
 /** Public final methods
 */
 
-extern int mlt_transition_init( mlt_transition this, void *child );
-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_timecode in, mlt_timecode out );
-extern int mlt_transition_get_a_track( mlt_transition this );
-extern int mlt_transition_get_b_track( mlt_transition this );
-extern mlt_timecode mlt_transition_get_in( mlt_transition this );
-extern mlt_timecode mlt_transition_get_out( mlt_transition this );
-extern void mlt_transition_close( mlt_transition this );
+#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 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