Tractor enhancements

[melted] / src / framework / mlt_playlist.c

diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c
index 04e61d4..0e017ce 100644 (file)
--- a/src/framework/mlt_playlist.c
+++ b/src/framework/mlt_playlist.c
@@ -89,6 +89,9 @@ mlt_playlist mlt_playlist_init( )
                mlt_properties_set( mlt_playlist_properties( this ), "eof", "pause" );
                mlt_properties_set( mlt_playlist_properties( this ), "resource", "<playlist>" );
                mlt_properties_set( mlt_playlist_properties( this ), "mlt_type", "mlt_producer" );
+               mlt_properties_set_position( mlt_playlist_properties( this ), "in", 0 );
+               mlt_properties_set_position( mlt_playlist_properties( this ), "out", 0 );
+               mlt_properties_set_position( mlt_playlist_properties( this ), "length", 0 );
 
                this->size = 10;
                this->list = malloc( this->size * sizeof( playlist_entry * ) );
@@ -203,7 +206,6 @@ static mlt_service mlt_playlist_virtual_seek( mlt_playlist this )
 {
        // Default producer to blank
        mlt_producer producer = NULL;
-       mlt_service service = NULL;
 
        // Map playlist position to real producer in virtual playlist
        mlt_position position = mlt_producer_frame( &this->parent );
@@ -271,14 +273,7 @@ static mlt_service mlt_playlist_virtual_seek( mlt_playlist this )
                producer = &this->blank;
        }
 
-       if ( producer != NULL )
-       {
-               service = mlt_producer_service( producer );
-               while ( mlt_service_consumer( service ) != NULL )
-                       service = mlt_service_consumer( service );
-       }
-
-       return service;
+       return mlt_producer_service( producer );
 }
 
 /** Invoked when a producer indicates that it has prematurely reached its end.
@@ -671,21 +666,7 @@ int mlt_playlist_join( mlt_playlist this, int clip, int count, int merge )
                for ( i = 0; i <= count; i ++ )
                {
                        playlist_entry *entry = this->list[ clip ];
-                       char *resource = mlt_properties_get( mlt_producer_properties( entry->producer ), "resource" );
-                       if ( merge && resource != NULL && !strcmp( resource, "<playlist>" ) )
-                       {
-                               mlt_playlist old_clip = ( mlt_playlist )entry->producer;
-                               while( old_clip->count )
-                               {
-                                       entry = old_clip->list[ 0 ];
-                                       mlt_playlist_append_io( new_clip, entry->producer, entry->frame_in, entry->frame_out );
-                                       mlt_playlist_remove( old_clip, 0 );
-                               }
-                       }
-                       else
-                       {
-                               mlt_playlist_append_io( new_clip, entry->producer, entry->frame_in, entry->frame_out );
-                       }
+                       mlt_playlist_append_io( new_clip, entry->producer, entry->frame_in, entry->frame_out );
                        mlt_playlist_remove( this, clip );
                }
                mlt_playlist_insert( this, mlt_playlist_producer( new_clip ), clip, 0, -1 );