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 );
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;
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 );
}
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.
*/
if ( instance != NULL )
{
- clear_unit( unit );
mlt_properties properties = unit->properties;
mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL );
- mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL );
- mlt_consumer_purge( consumer );
+ 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 );
mlt_producer_close( instance );
return valerie_ok;
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 );
{
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 );
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 );
{
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 );
{
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 );
{
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 );
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;
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 );
return 0;
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;
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 );
}
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 );
{
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." );