X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_transition.c;h=12443d7370e4a7cd1958fccb7d66b2d373af7478;hb=23571c330fd1644833dcb73661ac987eda177200;hp=9eb0c46d9df571e7dc24035d359df2ec82af41b3;hpb=1fd5d30c5326f73a3889e3bf4f377f96e551a6d1;p=melted diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c index 9eb0c46..12443d7 100644 --- a/src/framework/mlt_transition.c +++ b/src/framework/mlt_transition.c @@ -50,13 +50,23 @@ int mlt_transition_init( mlt_transition this, void *child ) mlt_properties_set_position( properties, "out", 0 ); mlt_properties_set_int( properties, "a_track", 0 ); mlt_properties_set_int( properties, "b_track", 1 ); - mlt_properties_set( properties, "resource", "" ); return 0; } return 1; } +/** Create a new transition. +*/ + +mlt_transition mlt_transition_new( ) +{ + mlt_transition this = calloc( 1, sizeof( struct mlt_transition_s ) ); + if ( this != NULL ) + mlt_transition_init( this, NULL ); + return this; +} + /** Get the service associated to the transition. */ @@ -136,7 +146,7 @@ mlt_position mlt_transition_get_out( mlt_transition this ) If we have no process method (unlikely), we simply return the a_frame unmolested. */ -static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame ) +mlt_frame mlt_transition_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame ) { if ( this->process == NULL ) return a_frame; @@ -170,7 +180,6 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i mlt_position in = mlt_properties_get_position( properties, "in" ); mlt_position out = mlt_properties_get_position( properties, "out" ); - // Fetch a and b frames together... if ( ( index == a_track || index == b_track ) && !( this->a_held || this->b_held ) ) { mlt_service_get_frame( this->producer, &this->a_frame, a_track ); @@ -187,7 +196,7 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i if ( position >= in && position <= out ) { // Process the transition - *frame = transition_process( this, this->a_frame, this->b_frame ); + *frame = mlt_transition_process( this, this->a_frame, this->b_frame ); this->a_held = 0; } else