X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_multitrack.c;h=d274dbcd5609ea6456cd38e54347c0ec80b8b137;hb=2e467c2eeba2b51aecddda21d4bb97bef4cd1459;hp=2c3d927b0b59c12da543d0ad8af7c48e74e7e127;hpb=4db14da139d0cce1807d5f3530b271238786b795;p=melted diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c index 2c3d927..d274dbc 100644 --- a/src/framework/mlt_multitrack.c +++ b/src/framework/mlt_multitrack.c @@ -27,6 +27,14 @@ #include #include +struct mlt_track_s +{ + mlt_producer producer; + mlt_event event; +}; + +typedef struct mlt_track_s *mlt_track; + /** Private definition. */ @@ -34,7 +42,7 @@ struct mlt_multitrack_s { // We're extending producer here struct mlt_producer_s parent; - mlt_producer *list; + mlt_track *list; int size; int count; }; @@ -117,7 +125,8 @@ void mlt_multitrack_refresh( mlt_multitrack this ) for ( i = 0; i < this->count; i ++ ) { // Get the producer from this index - mlt_producer producer = this->list[ i ]; + mlt_track track = this->list[ i ]; + mlt_producer producer = track->producer; // If it's allocated then, update our stats if ( producer != NULL ) @@ -127,7 +136,7 @@ void mlt_multitrack_refresh( mlt_multitrack this ) mlt_properties_set( mlt_producer_properties( producer ), "eof", "continue" ); // Determine the longest length - if ( !mlt_properties_get_int( mlt_producer_properties( producer ), "hide" ) ) + //if ( !mlt_properties_get_int( mlt_producer_properties( producer ), "hide" ) ) length = mlt_producer_get_playtime( producer ) > length ? mlt_producer_get_playtime( producer ) : length; // Handle fps @@ -148,11 +157,21 @@ void mlt_multitrack_refresh( mlt_multitrack this ) } // Update multitrack properties now - we'll not destroy the in point here + mlt_events_block( properties, properties ); mlt_properties_set_position( properties, "length", length ); + mlt_events_unblock( properties, properties ); mlt_properties_set_position( properties, "out", length - 1 ); mlt_properties_set_double( properties, "fps", fps ); } +/** Listener for producers on the playlist. +*/ + +static void mlt_multitrack_listener( mlt_producer producer, mlt_multitrack this ) +{ + mlt_multitrack_refresh( this ); +} + /** Connect a producer to a given track. Note that any producer can be connected here, but see special case treatment @@ -170,14 +189,28 @@ int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int trac if ( track >= this->size ) { int i; - this->list = realloc( this->list, ( track + 10 ) * sizeof( mlt_producer ) ); + this->list = realloc( this->list, ( track + 10 ) * sizeof( mlt_track ) ); for ( i = this->size; i < track + 10; i ++ ) this->list[ i ] = NULL; this->size = track + 10; } - + + if ( this->list[ track ] != NULL ) + { + mlt_event_close( this->list[ track ]->event ); + mlt_producer_close( this->list[ track ]->producer ); + } + else + { + this->list[ track ] = malloc( sizeof( struct mlt_track_s ) ); + } + // Assign the track in our list here - this->list[ track ] = producer; + this->list[ track ]->producer = producer; + this->list[ track ]->event = mlt_events_listen( mlt_producer_properties( producer ), this, + "producer-changed", ( mlt_listener )mlt_multitrack_listener ); + mlt_properties_inc_ref( mlt_producer_properties( producer ) ); + mlt_event_inc_ref( this->list[ track ]->event ); // Increment the track count if need be if ( track >= this->count ) @@ -206,7 +239,7 @@ mlt_producer mlt_multitrack_track( mlt_multitrack this, int track ) mlt_producer producer = NULL; if ( this->list != NULL && track < this->count ) - producer = this->list[ track ]; + producer = this->list[ track ]->producer; return producer; } @@ -258,7 +291,7 @@ mlt_position mlt_multitrack_clip( mlt_multitrack this, mlt_whence whence, int in for ( i = 0; i < this->count; i ++ ) { // Get the producer for this track - mlt_producer producer = this->list[ i ]; + mlt_producer producer = this->list[ i ]->producer; // If it's assigned and not a hidden track if ( producer != NULL ) @@ -359,11 +392,20 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind if ( index < this->count && this->list[ index ] != NULL ) { // Get the producer for this track - mlt_producer producer = this->list[ index ]; + mlt_producer producer = this->list[ index ]->producer; + + // Get the track hide property + int hide = mlt_properties_get_int( mlt_producer_properties( mlt_producer_cut_parent( producer ) ), "hide" ); // Obtain the current position mlt_position position = mlt_producer_frame( parent ); + // Get the parent properties + mlt_properties producer_properties = mlt_producer_properties( parent ); + + // Get the speed + double speed = mlt_properties_get_double( producer_properties, "_speed" ); + // Make sure we're at the same point mlt_producer_seek( producer, position ); @@ -371,11 +413,10 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind mlt_service_get_frame( mlt_producer_service( producer ), frame, 0 ); // Indicate speed of this producer - mlt_properties producer_properties = mlt_producer_properties( parent ); - double speed = mlt_properties_get_double( producer_properties, "_speed" ); mlt_properties properties = mlt_frame_properties( *frame ); mlt_properties_set_double( properties, "_speed", speed ); - mlt_properties_set_int( properties, "hide", mlt_properties_get_int( mlt_producer_properties( producer ), "hide" ) ); + mlt_properties_set_position( properties, "_position", position ); + mlt_properties_set_int( properties, "hide", hide ); } else { @@ -394,9 +435,6 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind // Move to the next frame mlt_producer_prepare_next( parent ); } - - // Refresh our stats - //mlt_multitrack_refresh( this ); } return 0; @@ -407,12 +445,26 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind void mlt_multitrack_close( mlt_multitrack this ) { - // Close the producer - mlt_producer_close( &this->parent ); + if ( this != NULL && mlt_properties_dec_ref( mlt_multitrack_properties( this ) ) <= 0 ) + { + int i = 0; + for ( i = 0; i < this->count; i ++ ) + { + if ( this->list[ i ] != NULL ) + { + mlt_event_close( this->list[ i ]->event ); + mlt_producer_close( this->list[ i ]->producer ); + free( this->list[ i ] ); + } + } - // Free the list - free( this->list ); + // Close the producer + mlt_producer_close( &this->parent ); - // Free the object - free( this ); + // Free the list + free( this->list ); + + // Free the object + free( this ); + } }