X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_multitrack.c;h=50a9426d9c1c507df26566ea71a12fcf1f3e7207;hb=9ad7cb6cdea367db7a720fa0335f8b8eccf0ae09;hp=ca3103acc2483dcc7c71924719d310841aa4a511;hpb=0b288164cbeb9a3c98107d439d86844be13ba910;p=melted diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c index ca3103a..50a9426 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; }; @@ -78,7 +86,7 @@ mlt_multitrack mlt_multitrack_init( ) mlt_producer mlt_multitrack_producer( mlt_multitrack this ) { - return &this->parent; + return this != NULL ? &this->parent : NULL; } /** Get the service associated this multitrack. @@ -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,8 @@ void mlt_multitrack_refresh( mlt_multitrack this ) mlt_properties_set( mlt_producer_properties( producer ), "eof", "continue" ); // Determine the longest length - length = mlt_producer_get_playtime( producer ) > length ? mlt_producer_get_playtime( producer ) : length; + 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 if ( fps == 0 ) @@ -147,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 @@ -169,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 ) @@ -205,14 +239,14 @@ 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; } static int position_compare( const void *p1, const void *p2 ) { - return *( int64_t * )p1 - *( int64_t * )p2; + return *( mlt_position * )p1 - *( mlt_position * )p2; } static int add_unique( mlt_position *array, int size, mlt_position position ) @@ -251,15 +285,15 @@ mlt_position mlt_multitrack_clip( mlt_multitrack this, mlt_whence whence, int in mlt_position position = 0; int i = 0; int j = 0; - int64_t *map = malloc( 1000 * sizeof( mlt_position ) ); + mlt_position *map = malloc( 1000 * sizeof( mlt_position ) ); int count = 0; 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... + // If it's assigned and not a hidden track if ( producer != NULL ) { // Get the properties of this producer @@ -284,7 +318,7 @@ mlt_position mlt_multitrack_clip( mlt_multitrack this, mlt_whence whence, int in } // Now sort the map - qsort( map, count, sizeof( int64_t ), position_compare ); + qsort( map, count, sizeof( mlt_position ), position_compare ); // Now locate the requested index switch( whence ) @@ -358,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 ); @@ -374,6 +408,8 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind 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_position( properties, "_position", position ); + mlt_properties_set_int( properties, "hide", mlt_properties_get_int( mlt_producer_properties( producer ), "hide" ) ); } else { @@ -392,9 +428,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; @@ -405,12 +438,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 ] ); + } + } + + // Close the producer + mlt_producer_close( &this->parent ); - // Free the list - free( this->list ); + // Free the list + free( this->list ); - // Free the object - free( this ); + // Free the object + free( this ); + } }