#include <stdio.h>
#include <stdlib.h>
+struct mlt_track_s
+{
+ mlt_producer producer;
+ mlt_event event;
+};
+
+typedef struct mlt_track_s *mlt_track;
+
/** Private definition.
*/
{
// We're extending producer here
struct mlt_producer_s parent;
- mlt_producer *list;
+ mlt_track *list;
int size;
int count;
};
mlt_producer mlt_multitrack_producer( mlt_multitrack this )
{
- return &this->parent;
+ return this != NULL ? &this->parent : NULL;
}
/** Get the service associated this multitrack.
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 )
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 )
}
// 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
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 )
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 )
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
}
// 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 )
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 );
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
{
// Move to the next frame
mlt_producer_prepare_next( parent );
}
-
- // Refresh our stats
- //mlt_multitrack_refresh( this );
}
return 0;
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 );
+ }
}
projects / melted / blobdiff