X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_multitrack.c;h=84f23893c1e97c0ad3e5b04aef639f14344c5794;hb=3531bc485623608b5ecc6e780710251d32d6161c;hp=c9ea81ce6c820ac1a2fe5b3be1bd1f3297d22300;hpb=42bd0aedb6d3d65bedb98479adcdbaeb326dfee9;p=melted diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c index c9ea81c..84f2389 100644 --- a/src/framework/mlt_multitrack.c +++ b/src/framework/mlt_multitrack.c @@ -212,7 +212,7 @@ mlt_producer mlt_multitrack_track( mlt_multitrack this, int track ) 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,7 +251,7 @@ 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 ++ ) @@ -284,7 +284,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 ) @@ -374,6 +374,7 @@ 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_int( properties, "hide", mlt_properties_get_int( mlt_producer_properties( producer ), "hide" ) ); } else { @@ -394,7 +395,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int ind } // Refresh our stats - mlt_multitrack_refresh( this ); + //mlt_multitrack_refresh( this ); } return 0;