From: lilo_booter Date: Fri, 3 Sep 2004 11:15:25 +0000 (+0000) Subject: Multitrack and tractor producer-changed event X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=c8bbb9577660f70c8d72d48983b20168d1cb178d;p=melted Multitrack and tractor producer-changed event git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@407 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c index d00525d..24aacc5 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 ) @@ -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,7 +392,7 @@ 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; // Obtain the current position mlt_position position = mlt_producer_frame( parent ); @@ -409,6 +442,17 @@ void mlt_multitrack_close( mlt_multitrack this ) { 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 ] ); + } + } + // Close the producer mlt_producer_close( &this->parent ); diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c index 3dbc50b..769a26c 100644 --- a/src/framework/mlt_tractor.c +++ b/src/framework/mlt_tractor.c @@ -42,6 +42,7 @@ struct mlt_tractor_s */ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int track ); +static void mlt_tractor_listener( mlt_multitrack tracks, mlt_tractor this ); /** Constructor for the tractor. */ @@ -92,6 +93,8 @@ mlt_tractor mlt_tractor_new( ) mlt_properties_set_data( props, "multitrack", multitrack, 0, ( mlt_destructor )mlt_multitrack_close, NULL ); mlt_properties_set_data( props, "field", field, 0, ( mlt_destructor )mlt_field_close, NULL ); + mlt_events_listen( mlt_multitrack_properties( multitrack ), this, "producer-changed", ( mlt_listener )mlt_tractor_listener ); + producer->get_frame = producer_get_frame; producer->close = ( mlt_destructor )mlt_tractor_close; producer->close_object = this; @@ -153,12 +156,21 @@ void mlt_tractor_refresh( mlt_tractor this ) mlt_multitrack multitrack = mlt_tractor_multitrack( this ); mlt_properties properties = mlt_multitrack_properties( multitrack ); mlt_properties self = mlt_tractor_properties( this ); + mlt_events_block( properties, self ); + mlt_events_block( self, self ); mlt_multitrack_refresh( multitrack ); mlt_properties_set_position( self, "in", 0 ); mlt_properties_set_position( self, "out", mlt_properties_get_position( properties, "out" ) ); + mlt_events_unblock( self, self ); + mlt_events_unblock( properties, self ); mlt_properties_set_position( self, "length", mlt_properties_get_position( properties, "length" ) ); } +static void mlt_tractor_listener( mlt_multitrack tracks, mlt_tractor this ) +{ + mlt_tractor_refresh( this ); +} + /** Connect the tractor. */ @@ -178,9 +190,7 @@ int mlt_tractor_connect( mlt_tractor this, mlt_service producer ) int mlt_tractor_set_track( mlt_tractor this, mlt_producer producer, int index ) { - int error = mlt_multitrack_connect( mlt_tractor_multitrack( this ), producer, index ); - mlt_tractor_refresh( this ); - return error; + return mlt_multitrack_connect( mlt_tractor_multitrack( this ), producer, index ); } /** Get the producer for a specific track.