X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_unit.c;h=4974e387170cbac0110a872ecb9facb96679b2fe;hb=3902731cb8a9622204d584c4962c74e2a5a35428;hp=370eb11e40eaff0c26ace6d06684462f48037b7d;hpb=222313cf587e194a130a82725a77d76ce14f2953;p=melted diff --git a/src/miracle/miracle_unit.c b/src/miracle/miracle_unit.c index 370eb11..4974e38 100644 --- a/src/miracle/miracle_unit.c +++ b/src/miracle/miracle_unit.c @@ -1,5 +1,5 @@ /* - * miracle_unit.c -- DV Transmission Unit Implementation + * miracle_unit.c -- Transmission Unit Implementation * Copyright (C) 2002-2003 Ushodaya Enterprises Limited * Author: Dan Dennedy * @@ -62,14 +62,13 @@ miracle_unit miracle_unit_init( int index, char *constructor ) if ( arg != NULL ) *arg ++ = '\0'; - consumer = mlt_factory_consumer( id, arg ); + consumer = mlt_factory_consumer( NULL, id, arg ); if ( consumer != NULL ) { mlt_playlist playlist = mlt_playlist_init( ); this = calloc( sizeof( miracle_unit_t ), 1 ); this->properties = mlt_properties_new( ); - this->old_playlist = mlt_playlist_init( ); mlt_properties_init( this->properties, this ); mlt_properties_set_int( this->properties, "unit", index ); mlt_properties_set_int( this->properties, "generation", 0 ); @@ -84,19 +83,6 @@ miracle_unit miracle_unit_init( int index, char *constructor ) return this; } -static void copy_playlist( mlt_playlist dest, mlt_playlist src ) -{ - int i; - - for ( i = 0; i < mlt_playlist_count( src ); i ++ ) - { - mlt_playlist_clip_info info; - mlt_playlist_get_clip_info( src, &info, i ); - if ( info.producer != NULL ) - mlt_playlist_append_io( dest, info.producer, info.frame_in, info.frame_out ); - } -} - static char *strip_root( miracle_unit unit, char *file ) { mlt_properties properties = unit->properties; @@ -160,7 +146,15 @@ void miracle_unit_set_notifier( miracle_unit this, valerie_notifier notifier, ch static mlt_producer locate_producer( miracle_unit unit, char *file ) { - return mlt_factory_producer( "fezzik", file ); + // Try to get the profile from the consumer + mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL ); + mlt_profile profile = NULL; + + if ( consumer != NULL ) + { + profile = mlt_service_profile( MLT_CONSUMER_SERVICE( consumer ) ); + } + return mlt_factory_producer( profile, "fezzik", file ); } /** Update the generation count. @@ -182,10 +176,10 @@ static void clear_unit( miracle_unit unit ) mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); mlt_producer producer = MLT_PLAYLIST_PRODUCER( playlist ); - mlt_playlist_clear( unit->old_playlist ); - copy_playlist( unit->old_playlist, playlist ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_clear( playlist ); mlt_producer_seek( producer, 0 ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); update_generation( unit ); } @@ -209,15 +203,38 @@ static void clean_unit( miracle_unit unit ) mlt_properties_inc_ref( MLT_PRODUCER_PROPERTIES( info.producer ) ); position -= info.start; clear_unit( unit ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_append_io( playlist, info.producer, info.frame_in, info.frame_out ); mlt_producer_seek( producer, position ); mlt_producer_set_speed( producer, speed ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_producer_close( info.producer ); } update_generation( unit ); } +/** Remove everything up to the current clip from the unit. +*/ + +static void wipe_unit( miracle_unit unit ) +{ + mlt_properties properties = unit->properties; + mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + mlt_playlist_clip_info info; + int current = mlt_playlist_current_clip( playlist ); + mlt_playlist_get_clip_info( playlist, &info, current ); + + if ( info.producer != NULL && info.start > 0 ) + { + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); + mlt_playlist_remove_region( playlist, 0, info.start - 1 ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); + } + + update_generation( unit ); +} + /** Generate a report on all loaded clips. */ @@ -269,8 +286,10 @@ valerie_error_code miracle_unit_load( miracle_unit unit, char *clip, int32_t in, mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); int original = mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( playlist ) ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_append_io( playlist, instance, in, out ); mlt_playlist_remove_region( playlist, 0, original ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); miracle_log( LOG_DEBUG, "loaded clip %s", clip ); update_generation( unit ); miracle_unit_status_communicate( unit ); @@ -290,7 +309,9 @@ valerie_error_code miracle_unit_insert( miracle_unit unit, char *clip, int index mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); fprintf( stderr, "inserting clip %s before %d\n", clip, index ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_insert( playlist, instance, index, in, out ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); miracle_log( LOG_DEBUG, "inserted clip %s at %d", clip, index ); update_generation( unit ); miracle_unit_status_communicate( unit ); @@ -305,7 +326,9 @@ valerie_error_code miracle_unit_remove( miracle_unit unit, int index ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_remove( playlist, index ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); miracle_log( LOG_DEBUG, "removed clip at %d", index ); update_generation( unit ); miracle_unit_status_communicate( unit ); @@ -320,6 +343,14 @@ valerie_error_code miracle_unit_clean( miracle_unit unit ) return valerie_ok; } +valerie_error_code miracle_unit_wipe( miracle_unit unit ) +{ + wipe_unit( unit ); + miracle_log( LOG_DEBUG, "Wiped playlist" ); + miracle_unit_status_communicate( unit ); + return valerie_ok; +} + valerie_error_code miracle_unit_clear( miracle_unit unit ) { mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL ); @@ -334,7 +365,9 @@ valerie_error_code miracle_unit_move( miracle_unit unit, int src, int dest ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_move( playlist, src, dest ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); miracle_log( LOG_DEBUG, "moved clip %d to %d", src, dest ); update_generation( unit ); miracle_unit_status_communicate( unit ); @@ -358,8 +391,10 @@ valerie_error_code miracle_unit_append( miracle_unit unit, char *clip, int32_t i { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_append_io( playlist, instance, in, out ); miracle_log( LOG_DEBUG, "appended clip %s", clip ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); update_generation( unit ); miracle_unit_status_communicate( unit ); mlt_producer_close( instance ); @@ -379,7 +414,9 @@ valerie_error_code miracle_unit_append_service( miracle_unit unit, mlt_service s { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_append( playlist, ( mlt_producer )service ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); miracle_log( LOG_DEBUG, "appended clip" ); update_generation( unit ); miracle_unit_status_communicate( unit ); @@ -456,6 +493,8 @@ int miracle_unit_transfer( miracle_unit dest_unit, miracle_unit src_unit ) clear_unit( src_unit ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( dest_playlist ) ); + for ( i = 0; i < mlt_playlist_count( tmp_playlist ); i ++ ) { mlt_playlist_clip_info info; @@ -464,7 +503,10 @@ int miracle_unit_transfer( miracle_unit dest_unit, miracle_unit src_unit ) mlt_playlist_append_io( dest_playlist, info.producer, info.frame_in, info.frame_out ); } + mlt_service_unlock( MLT_PLAYLIST_SERVICE( dest_playlist ) ); + update_generation( dest_unit ); + miracle_unit_status_communicate( dest_unit ); mlt_playlist_close( tmp_playlist ); @@ -509,12 +551,12 @@ int miracle_unit_get_status( miracle_unit unit, valerie_status status ) status->fps = mlt_producer_get_fps( producer ); status->in = info.frame_in; status->out = info.frame_out; - status->position = mlt_producer_position( clip ); + status->position = mlt_producer_frame( clip ); status->length = mlt_producer_get_length( clip ); strncpy( status->tail_clip, title, sizeof( status->tail_clip ) ); status->tail_in = info.frame_in; status->tail_out = info.frame_out; - status->tail_position = mlt_producer_position( clip ); + status->tail_position = mlt_producer_frame( clip ); status->tail_length = mlt_producer_get_length( clip ); status->clip_index = mlt_playlist_current_clip( playlist ); status->seek_flag = 1; @@ -559,7 +601,7 @@ void miracle_unit_change_position( miracle_unit unit, int clip, int32_t position else if ( clip >= mlt_playlist_count( playlist ) ) { clip = mlt_playlist_count( playlist ) - 1; - position = LONG_MAX; + position = INT_MAX; } if ( mlt_playlist_get_clip_info( playlist, &info, clip ) == 0 ) @@ -604,7 +646,9 @@ int miracle_unit_set_clip_in( miracle_unit unit, int index, int32_t position ) if ( error == 0 ) { miracle_unit_play( unit, 0 ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); error = mlt_playlist_resize_clip( playlist, index, position, info.frame_out ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); update_generation( unit ); miracle_unit_change_position( unit, index, 0 ); } @@ -625,7 +669,9 @@ int miracle_unit_set_clip_out( miracle_unit unit, int index, int32_t position ) if ( error == 0 ) { miracle_unit_play( unit, 0 ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); error = mlt_playlist_resize_clip( playlist, index, info.frame_in, position ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); update_generation( unit ); miracle_unit_status_communicate( unit ); miracle_unit_change_position( unit, index, -1 ); @@ -723,7 +769,6 @@ void miracle_unit_close( miracle_unit unit ) { miracle_log( LOG_DEBUG, "closing unit..." ); miracle_unit_terminate( unit ); - mlt_playlist_close( unit->old_playlist ); mlt_properties_close( unit->properties ); free( unit ); miracle_log( LOG_DEBUG, "... unit closed." );