X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_playlist.c;h=bd9d6b239a429384d9b7081c5a8ba8ebe742552f;hb=9b115c18489fdc84e2198fef65e4e444f579ff24;hp=1ed7603c029d5a79cc525c8faeff5f118b3111dc;hpb=cc8b6005abe30b5f0816b5aa6b87aa6867275228;p=melted

diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c
index 1ed7603..bd9d6b2 100644
--- a/src/framework/mlt_playlist.c
+++ b/src/framework/mlt_playlist.c
@@ -21,7 +21,10 @@
 #include "config.h"
 
 #include "mlt_playlist.h"
+#include "mlt_tractor.h"
+#include "mlt_field.h"
 #include "mlt_frame.h"
+#include "mlt_transition.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,13 +33,18 @@
 /** Virtual playlist entry.
 */
 
-typedef struct
+typedef struct playlist_entry_s
 {
 	mlt_producer producer;
-	int64_t frame_in;
-	int64_t frame_out;
-	int64_t frame_count;
-	mlt_timecode playtime;
+	mlt_position frame_in;
+	mlt_position frame_out;
+	mlt_position frame_count;
+	mlt_position producer_length;
+	mlt_event event;
+	int mix_in_length;
+	int mix_out_length;
+	struct playlist_entry_s *mix_in;
+	struct playlist_entry_s *mix_out;
 }
 playlist_entry;
 
@@ -57,6 +65,8 @@ struct mlt_playlist_s
 */
 
 static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index );
+static int mlt_playlist_unmix( mlt_playlist this, int clip );
+static int mlt_playlist_resize_mix( mlt_playlist this, int clip, int in, int out );
 
 /** Constructor.
 */
@@ -74,14 +84,28 @@ mlt_playlist mlt_playlist_init( )
 		// Override the producer get_frame
 		producer->get_frame = producer_get_frame;
 
+		// Define the destructor
+		producer->close = ( mlt_destructor )mlt_playlist_close;
+		producer->close_object = this;
+
 		// Initialise blank
 		mlt_producer_init( &this->blank, NULL );
+		mlt_properties_set( mlt_producer_properties( &this->blank ), "mlt_service", "blank" );
+		mlt_properties_set( mlt_producer_properties( &this->blank ), "resource", "blank" );
 
 		// Indicate that this producer is a playlist
 		mlt_properties_set_data( mlt_playlist_properties( this ), "playlist", this, 0, NULL, NULL );
 
 		// Specify the eof condition
 		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 * ) );
 	}
 	
 	return this;
@@ -92,7 +116,7 @@ mlt_playlist mlt_playlist_init( )
 
 mlt_producer mlt_playlist_producer( mlt_playlist this )
 {
-	return &this->parent;
+	return this != NULL ? &this->parent : NULL;
 }
 
 /** Get the service associated to this playlist.
@@ -111,18 +135,24 @@ mlt_properties mlt_playlist_properties( mlt_playlist this )
 	return mlt_producer_properties( &this->parent );
 }
 
+/** Refresh the playlist after a clip has been changed.
+*/
+
 static int mlt_playlist_virtual_refresh( mlt_playlist this )
 {
-	int i = 0;
+	// Obtain the properties
+	mlt_properties properties = mlt_playlist_properties( this );
 
 	// Get the fps of the first producer
-	double fps = mlt_properties_get_double( mlt_playlist_properties( this ), "first_fps" );
-	mlt_timecode playtime = 0;
+	double fps = mlt_properties_get_double( properties, "first_fps" );
+	int i = 0;
+	mlt_position frame_count = 0;
 
 	for ( i = 0; i < this->count; i ++ )
 	{
 		// Get the producer
 		mlt_producer producer = this->list[ i ]->producer;
+		int current_length = mlt_producer_get_out( producer ) - mlt_producer_get_in( producer ) + 1;
 
 		// If fps is 0
 		if ( fps == 0 )
@@ -139,34 +169,94 @@ static int mlt_playlist_virtual_refresh( mlt_playlist this )
 			mlt_properties_set_double( mlt_producer_properties( producer ), "fps", fps );
 		}
 
-		// Update the playtime for this clip
-		playtime += this->list[ i ]->playtime;
+		// Check if the length of the producer has changed
+		if ( this->list[ i ]->producer != &this->blank &&
+			 ( this->list[ i ]->frame_in != mlt_producer_get_in( producer ) ||
+			   this->list[ i ]->frame_out != mlt_producer_get_out( producer ) ) )
+		{
+			// This clip should be removed...
+			if ( current_length == 1 )
+			{
+				this->list[ i ]->frame_in = 0;
+				this->list[ i ]->frame_out = 0;
+				this->list[ i ]->frame_count = 0;
+			}
+			else 
+			{
+				this->list[ i ]->frame_in = mlt_producer_get_in( producer );
+				this->list[ i ]->frame_out = mlt_producer_get_out( producer );
+				this->list[ i ]->frame_count = current_length;
+			}
+
+			// Update the producer_length
+			this->list[ i ]->producer_length = current_length;
+		}
+
+		// Update the frame_count for this clip
+		frame_count += this->list[ i ]->frame_count;
 	}
 
 	// Refresh all properties
-	mlt_properties_set_double( mlt_playlist_properties( this ), "first_fps", fps );
-	mlt_properties_set_double( mlt_playlist_properties( this ), "fps", fps == 0 ? 25 : fps );
-	mlt_properties_set_timecode( mlt_playlist_properties( this ), "length", playtime );
-	mlt_properties_set_timecode( mlt_playlist_properties( this ), "out", playtime );
+	mlt_properties_set_double( properties, "first_fps", fps );
+	mlt_properties_set_double( properties, "fps", fps == 0 ? 25 : fps );
+	mlt_events_block( properties, properties );
+	mlt_properties_set_position( properties, "length", frame_count );
+	mlt_events_unblock( properties, properties );
+	mlt_properties_set_position( properties, "out", frame_count - 1 );
 
 	return 0;
 }
 
+/** Listener for producers on the playlist.
+*/
+
+static void mlt_playlist_listener( mlt_producer producer, mlt_playlist this )
+{
+	mlt_playlist_virtual_refresh( this );
+}
+
 /** Append to the virtual playlist.
 */
 
-static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer, int64_t in, int64_t out )
+static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer source, mlt_position in, mlt_position out )
 {
-	double fps = mlt_properties_get_double( mlt_playlist_properties( this ), "fps" );
-	double playtime = ( double )( out - in + 1 ) / fps;
+	mlt_producer producer = NULL;
+	mlt_properties properties = NULL;
+
+	// If we have a cut, then use the in/out points from the cut
+	if ( &this->blank == source )
+	{
+		producer = source;
+		properties = mlt_producer_properties( producer );
+		mlt_properties_inc_ref( properties );
+	}
+	else if ( mlt_producer_is_cut( source ) )
+	{
+		producer = source;
+		if ( in == -1 )
+			in = mlt_producer_get_in( producer );
+		if ( out == -1 || out > mlt_producer_get_out( producer ) )
+			out = mlt_producer_get_out( producer );
+		properties = mlt_producer_properties( producer );
+		mlt_properties_inc_ref( properties );
+	}
+	else
+	{
+		producer = mlt_producer_cut( source, in, out );
+		if ( in == -1 || in < mlt_producer_get_in( producer ) )
+			in = mlt_producer_get_in( producer );
+		if ( out == -1 || out > mlt_producer_get_out( producer ) )
+			out = mlt_producer_get_out( producer );
+		properties = mlt_producer_properties( producer );
+	}
+
 
 	// Check that we have room
 	if ( this->count >= this->size )
 	{
 		int i;
 		this->list = realloc( this->list, ( this->size + 10 ) * sizeof( playlist_entry * ) );
-		for ( i = this->size; i < this->size + 10; i ++ )
-			this->list[ i ] = NULL;
+		for ( i = this->size; i < this->size + 10; i ++ ) this->list[ i ] = NULL;
 		this->size += 10;
 	}
 
@@ -175,8 +265,14 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer
 	this->list[ this->count ]->frame_in = in;
 	this->list[ this->count ]->frame_out = out;
 	this->list[ this->count ]->frame_count = out - in + 1;
-	this->list[ this->count ]->playtime = playtime;
+	this->list[ this->count ]->producer_length = mlt_producer_get_out( producer ) - mlt_producer_get_in( producer ) + 1;
+	this->list[ this->count ]->event = mlt_events_listen( properties, this, "producer-changed", ( mlt_listener )mlt_playlist_listener );
+	mlt_event_inc_ref( this->list[ this->count ]->event );
+
+	mlt_properties_set( mlt_producer_properties( source ), "eof", "pause" );
+	mlt_properties_set( properties, "eof", "pause" );
 
+	mlt_producer_set_speed( source, 0 );
 	mlt_producer_set_speed( producer, 0 );
 
 	this->count ++;
@@ -187,27 +283,35 @@ static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer
 /** Seek in the virtual playlist.
 */
 
-static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this )
+static mlt_service mlt_playlist_virtual_seek( mlt_playlist this )
 {
 	// Default producer to blank
 	mlt_producer producer = NULL;
 
 	// Map playlist position to real producer in virtual playlist
-	mlt_timecode pos = mlt_producer_position( &this->parent );
-	int64_t position = mlt_producer_frame_position( &this->parent, pos );
+	mlt_position position = mlt_producer_frame( &this->parent );
+
+	mlt_position original = position;
+
+	// Total number of frames
 	int64_t total = 0;
 
+	// Get the properties
 	mlt_properties properties = mlt_playlist_properties( this );
+
+	// Get the eof handling
 	char *eof = mlt_properties_get( properties, "eof" );
 
-	// Loop through the virtual playlist
+	// Index for the main loop
 	int i = 0;
 
+	// Loop for each producer until found
 	for ( i = 0; i < this->count; i ++ )
 	{
 		// Increment the total
 		total += this->list[ i ]->frame_count;
 
+		// Check if the position indicates that we have found the clip
 		if ( position < this->list[ i ]->frame_count )
 		{
 			// Found it, now break
@@ -224,47 +328,44 @@ static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this )
 	// Seek in real producer to relative position
 	if ( producer != NULL )
 	{
-		position += this->list[ i ]->frame_in;
-		position += mlt_producer_frame_position( producer, mlt_producer_get_in( producer ) );
-		mlt_producer_seek_frame( producer, position );
+		mlt_producer_seek( producer, position );
 	}
 	else if ( !strcmp( eof, "pause" ) && total > 0 )
 	{
 		playlist_entry *entry = this->list[ this->count - 1 ];
 		mlt_producer this_producer = mlt_playlist_producer( this );
-		mlt_producer_seek_frame( this_producer, total - 1 );
+		mlt_producer_seek( this_producer, original - 1 );
 		producer = entry->producer;
-		position = mlt_producer_frame_position( producer, mlt_producer_get_in( producer ) );
-		mlt_producer_seek_frame( producer, position + entry->frame_out );
+		mlt_producer_seek( producer, entry->frame_out );
+		mlt_producer_set_speed( this_producer, 0 );
 		mlt_producer_set_speed( producer, 0 );
 	}
 	else if ( !strcmp( eof, "loop" ) && total > 0 )
 	{
 		playlist_entry *entry = this->list[ 0 ];
 		mlt_producer this_producer = mlt_playlist_producer( this );
-		mlt_producer_seek_frame( this_producer, 0 );
+		mlt_producer_seek( this_producer, 0 );
 		producer = entry->producer;
-		position = entry->frame_in;
-		position += mlt_producer_frame_position( producer, mlt_producer_get_in( producer ) );
-		mlt_producer_seek_frame( producer, position );
+		mlt_producer_seek( producer, 0 );
 	}
 	else
 	{
-		mlt_producer_seek( mlt_playlist_producer( this ), 0 );
 		producer = &this->blank;
 	}
 
-	return producer;
+	return mlt_producer_service( producer );
 }
 
+/** Invoked when a producer indicates that it has prematurely reached its end.
+*/
+
 static mlt_producer mlt_playlist_virtual_set_out( mlt_playlist this )
 {
 	// Default producer to blank
 	mlt_producer producer = &this->blank;
 
 	// Map playlist position to real producer in virtual playlist
-	mlt_timecode pos = mlt_producer_position( &this->parent );
-	int64_t position = mlt_producer_frame_position( &this->parent, pos );
+	mlt_position position = mlt_producer_frame( &this->parent );
 
 	// Loop through the virtual playlist
 	int i = 0;
@@ -285,11 +386,11 @@ static mlt_producer mlt_playlist_virtual_set_out( mlt_playlist this )
 	}
 
 	// Seek in real producer to relative position
-	if ( i < this->count )
+	if ( i < this->count && this->list[ i ]->frame_out != position )
 	{
-		// Update the playtime for the changed clip (hmmm)
-		this->list[ i ]->frame_count = position + 1;
-		this->list[ i ]->frame_out = position - this->list[ i ]->frame_in;
+		// Update the frame_count for the changed clip (hmmm)
+		this->list[ i ]->frame_out = position;
+		this->list[ i ]->frame_count = this->list[ i ]->frame_out - this->list[ i ]->frame_in + 1;
 
 		// Refresh the playlist
 		mlt_playlist_virtual_refresh( this );
@@ -298,11 +399,13 @@ static mlt_producer mlt_playlist_virtual_set_out( mlt_playlist this )
 	return producer;
 }
 
+/** Obtain the current clips index.
+*/
+
 int mlt_playlist_current_clip( mlt_playlist this )
 {
 	// Map playlist position to real producer in virtual playlist
-	mlt_timecode pos = mlt_producer_position( &this->parent );
-	int64_t position = mlt_producer_frame_position( &this->parent, pos );
+	mlt_position position = mlt_producer_frame( &this->parent );
 
 	// Loop through the virtual playlist
 	int i = 0;
@@ -324,6 +427,9 @@ int mlt_playlist_current_clip( mlt_playlist this )
 	return i;
 }
 
+/** Obtain the current clips producer.
+*/
+
 mlt_producer mlt_playlist_current( mlt_playlist this )
 {
 	int i = mlt_playlist_current_clip( this );
@@ -333,12 +439,12 @@ mlt_producer mlt_playlist_current( mlt_playlist this )
 		return &this->blank;
 }
 
-/** Get the timecode which corresponds to the start of the next clip.
+/** Get the position which corresponds to the start of the next clip.
 */
 
-mlt_timecode mlt_playlist_clip( mlt_playlist this, mlt_whence whence, int index )
+mlt_position mlt_playlist_clip( mlt_playlist this, mlt_whence whence, int index )
 {
-	int64_t position = 0;
+	mlt_position position = 0;
 	int absolute_clip = index;
 	int i = 0;
 
@@ -364,32 +470,44 @@ mlt_timecode mlt_playlist_clip( mlt_playlist this, mlt_whence whence, int index
 	else if ( absolute_clip > this->count )
 		absolute_clip = this->count;
 
-	// Now determine the timecode
+	// Now determine the position
 	for ( i = 0; i < absolute_clip; i ++ )
 		position += this->list[ i ]->frame_count;
 
-	return mlt_producer_time( &this->parent, position );
+	return position;
 }
 
+/** Get all the info about the clip specified.
+*/
+
 int mlt_playlist_get_clip_info( mlt_playlist this, mlt_playlist_clip_info *info, int index )
 {
 	int error = index < 0 || index >= this->count;
 	memset( info, 0, sizeof( mlt_playlist_clip_info ) );
 	if ( !error )
 	{
-		mlt_producer producer = this->list[ index ]->producer;
+		mlt_producer producer = mlt_producer_cut_parent( this->list[ index ]->producer );
 		mlt_properties properties = mlt_producer_properties( producer );
+		info->clip = index;
 		info->producer = producer;
 		info->start = mlt_playlist_clip( this, mlt_whence_relative_start, index );
 		info->resource = mlt_properties_get( properties, "resource" );
 		info->frame_in = this->list[ index ]->frame_in;
-		info->in = mlt_producer_time( producer, info->frame_in );
 		info->frame_out = this->list[ index ]->frame_out;
-		info->out = mlt_producer_time( producer, info->frame_out );
-		info->playtime = this->list[ index ]->playtime;
+		info->frame_count = this->list[ index ]->frame_count;
 		info->length = mlt_producer_get_length( producer );
 		info->fps = mlt_producer_get_fps( producer );
+		info->event = this->list[ index ]->event;
+	}
+
+	// Determine the consuming filter service
+	if ( info->producer != NULL )
+	{
+		info->service = mlt_producer_service( info->producer );
+		while ( mlt_service_consumer( info->service ) != NULL )
+			info->service = mlt_service_consumer( info->service );
 	}
+
 	return error;
 }
 
@@ -406,6 +524,12 @@ int mlt_playlist_count( mlt_playlist this )
 
 int mlt_playlist_clear( mlt_playlist this )
 {
+	int i;
+	for ( i = 0; i < this->count; i ++ )
+	{
+		mlt_event_close( this->list[ i ]->event );
+		mlt_producer_close( this->list[ i ]->producer );
+	}
 	this->count = 0;
 	mlt_properties_set_double( mlt_playlist_properties( this ), "first_fps", 0 );
 	return mlt_playlist_virtual_refresh( this );
@@ -417,85 +541,396 @@ int mlt_playlist_clear( mlt_playlist this )
 int mlt_playlist_append( mlt_playlist this, mlt_producer producer )
 {
 	// Append to virtual list
-	int64_t in = mlt_producer_frame_position( producer, mlt_producer_get_in( producer ) );
-	int64_t out = mlt_producer_frame_position( producer, mlt_producer_get_out( producer ) );
-	return mlt_playlist_virtual_append( this, producer, 0, out - in );
+	return mlt_playlist_virtual_append( this, producer, 0, mlt_producer_get_playtime( producer ) - 1 );
 }
 
 /** Append a producer to the playlist with in/out points.
 */
 
-int mlt_playlist_append_io( mlt_playlist this, mlt_producer producer, double in, double out )
+int mlt_playlist_append_io( mlt_playlist this, mlt_producer producer, mlt_position in, mlt_position out )
 {
 	// Append to virtual list
 	if ( in != -1 && out != -1 )
-	{
-		int64_t fin = mlt_producer_frame_position( producer, in );
-		int64_t fout = mlt_producer_frame_position( producer, out );
-		return mlt_playlist_virtual_append( this, producer, fin, fout );
-	}
+		return mlt_playlist_virtual_append( this, producer, in, out );
 	else
-	{
 		return mlt_playlist_append( this, producer );
-	}
 }
 
 /** Append a blank to the playlist of a given length.
 */
 
-int mlt_playlist_blank( mlt_playlist this, mlt_timecode length )
+int mlt_playlist_blank( mlt_playlist this, mlt_position length )
 {
 	// Append to the virtual list
-	int64_t fout = mlt_producer_frame_position( &this->blank, length );
-	return mlt_playlist_virtual_append( this, &this->blank, 0, fout );
+	return mlt_playlist_virtual_append( this, &this->blank, 0, length );
 }
 
 /** Insert a producer into the playlist.
 */
 
-int mlt_playlist_insert( mlt_playlist this, mlt_producer producer, int where, mlt_timecode in, mlt_timecode out )
+int mlt_playlist_insert( mlt_playlist this, mlt_producer producer, int where, mlt_position in, mlt_position out )
 {
-	return 0;
+	// Append to end
+	mlt_events_block( mlt_playlist_properties( this ), this );
+	mlt_playlist_append_io( this, producer, in, out );
+
+	// Move to the position specified
+	mlt_playlist_move( this, this->count - 1, where );
+	mlt_events_unblock( mlt_playlist_properties( this ), this );
+
+	return mlt_playlist_virtual_refresh( this );
 }
 
+/** Remove an entry in the playlist.
+*/
+
 int mlt_playlist_remove( mlt_playlist this, int where )
 {
-	return 0;
+	int error = where < 0 || where >= this->count;
+	if ( error == 0 && mlt_playlist_unmix( this, where ) != 0 )
+	{
+		// We need to know the current clip and the position within the playlist
+		int current = mlt_playlist_current_clip( this );
+		mlt_position position = mlt_producer_position( mlt_playlist_producer( this ) );
+
+		// We need all the details about the clip we're removing
+		mlt_playlist_clip_info where_info;
+		playlist_entry *entry = this->list[ where ];
+
+		// Loop variable
+		int i = 0;
+
+		// Get the clip info 
+		mlt_playlist_get_clip_info( this, &where_info, where );
+
+		// Make sure the clip to be removed is valid and correct if necessary
+		if ( where < 0 ) 
+			where = 0;
+		if ( where >= this->count )
+			where = this->count - 1;
+
+		// Close the producer associated to the clip info
+		mlt_event_close( entry->event );
+		mlt_producer_close( entry->producer );
+		if ( entry->mix_in != NULL )
+			entry->mix_in->mix_out = NULL;
+		if ( entry->mix_out != NULL )
+			entry->mix_out->mix_in = NULL;
+
+		// Reorganise the list
+		for ( i = where + 1; i < this->count; i ++ )
+			this->list[ i - 1 ] = this->list[ i ];
+		this->count --;
+
+		// Correct position
+		if ( where == current )
+			mlt_producer_seek( mlt_playlist_producer( this ), where_info.start );
+		else if ( where < current && this->count > 0 )
+			mlt_producer_seek( mlt_playlist_producer( this ), position - where_info.frame_count );
+		else if ( this->count == 0 )
+			mlt_producer_seek( mlt_playlist_producer( this ), 0 );
+
+		// Free the entry
+		free( entry );
+
+		// Refresh the playlist
+		mlt_playlist_virtual_refresh( this );
+	}
+
+	return error;
 }
 
-int mlt_playlist_move( mlt_playlist this, int from, int to )
+/** Move an entry in the playlist.
+*/
+
+int mlt_playlist_move( mlt_playlist this, int src, int dest )
 {
+	int i;
+
+	/* We need to ensure that the requested indexes are valid and correct it as necessary */
+	if ( src < 0 ) 
+		src = 0;
+	if ( src >= this->count )
+		src = this->count - 1;
+
+	if ( dest < 0 ) 
+		dest = 0;
+	if ( dest >= this->count )
+		dest = this->count - 1;
+	
+	if ( src != dest && this->count > 1 )
+	{
+		int current = mlt_playlist_current_clip( this );
+		mlt_position position = mlt_producer_position( mlt_playlist_producer( this ) );
+		playlist_entry *src_entry = NULL;
+
+		// We need all the details about the current clip
+		mlt_playlist_clip_info current_info;
+
+		mlt_playlist_get_clip_info( this, &current_info, current );
+		position -= current_info.start;
+
+		if ( current == src )
+			current = dest;
+		else if ( current > src && current < dest )
+			current ++;
+		else if ( current == dest )
+			current = src;
+
+		src_entry = this->list[ src ];
+		if ( src > dest )
+		{
+			for ( i = src; i > dest; i -- )
+				this->list[ i ] = this->list[ i - 1 ];
+		}
+		else
+		{
+			for ( i = src; i < dest; i ++ )
+				this->list[ i ] = this->list[ i + 1 ];
+		}
+		this->list[ dest ] = src_entry;
+
+		mlt_playlist_get_clip_info( this, &current_info, current );
+		mlt_producer_seek( mlt_playlist_producer( this ), current_info.start + position );
+		mlt_playlist_virtual_refresh( this );
+	}
+
 	return 0;
 }
 
-int mlt_playlist_resize_clip( mlt_playlist this, int clip, mlt_timecode in, mlt_timecode out )
+/** Resize the current clip.
+*/
+
+int mlt_playlist_resize_clip( mlt_playlist this, int clip, mlt_position in, mlt_position out )
 {
 	int error = clip < 0 || clip >= this->count;
-	if ( error == 0 )
+	if ( error == 0 && mlt_playlist_resize_mix( this, clip, in, out ) != 0 )
 	{
 		playlist_entry *entry = this->list[ clip ];
 		mlt_producer producer = entry->producer;
 
 		if ( in <= -1 )
 			in = 0;
-		if ( out <= -1 || out >= mlt_producer_get_out( producer ) )
-			out = mlt_producer_get_out( producer );
+		if ( out <= -1 || out >= mlt_producer_get_length( producer ) )
+			out = mlt_producer_get_length( producer ) - 1;
 
 		if ( out < in )
 		{
-			mlt_timecode t = in;
+			mlt_position t = in;
 			in = out;
 			out = t;
 		}
 
-		int64_t fin = mlt_producer_frame_position( producer, in );
-		int64_t fout = mlt_producer_frame_position( producer, out );
+		mlt_producer_set_in_and_out( producer, in, out );
+	}
+	return error;
+}
+
+/** Split a clip on the playlist at the given position.
+*/
+
+int mlt_playlist_split( mlt_playlist this, int clip, mlt_position position )
+{
+	int error = clip < 0 || clip >= this->count;
+	if ( error == 0 )
+	{
+		playlist_entry *entry = this->list[ clip ];
+		if ( position > 0 && position < entry->frame_count )
+		{
+			mlt_producer parent = mlt_producer_cut_parent( entry->producer );
+			mlt_producer split = NULL;
+			int in = entry->frame_in;
+			int out = entry->frame_out;
+			mlt_events_block( mlt_playlist_properties( this ), this );
+			mlt_playlist_resize_clip( this, clip, in, in + position );
+			split = mlt_producer_cut( parent, in + position + 1, out );
+			mlt_playlist_insert( this, split, clip + 1, -1, -1 );
+			mlt_events_unblock( mlt_playlist_properties( this ), this );
+			mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL );
+		}
+		else
+		{
+			error = 1;
+		}
+	}
+	return error;
+}
+
+/** Join 1 or more consecutive clips.
+*/
 
-		entry->frame_in = fin;
-		entry->frame_out = fout;
-		entry->frame_count = fout - fin + 1;
-		entry->playtime = out - in;
-		mlt_playlist_virtual_refresh( this );
+int mlt_playlist_join( mlt_playlist this, int clip, int count, int merge )
+{
+	int error = clip < 0 || ( clip + 1 ) >= this->count;
+	if ( error == 0 )
+	{
+		int i = clip;
+		mlt_playlist new_clip = mlt_playlist_init( );
+		mlt_events_block( mlt_playlist_properties( this ), this );
+		if ( clip + count >= this->count )
+			count = this->count - clip;
+		for ( i = 0; i <= count; i ++ )
+		{
+			playlist_entry *entry = this->list[ clip ];
+			mlt_playlist_append( new_clip, entry->producer );
+			mlt_playlist_remove( this, clip );
+		}
+		mlt_events_unblock( mlt_playlist_properties( this ), this );
+		mlt_playlist_insert( this, mlt_playlist_producer( new_clip ), clip, 0, -1 );
+		mlt_playlist_close( new_clip );
+	}
+	return error;
+}
+
+int mlt_playlist_mix( mlt_playlist this, int clip, int length, mlt_transition transition )
+{
+	int error = ( clip < 0 || clip + 1 >= this->count ) && this->list[ clip ]->mix_out != NULL;
+	if ( error == 0 )
+	{
+		playlist_entry *clip_a = this->list[ clip ];
+		playlist_entry *clip_b = this->list[ clip + 1 ];
+		mlt_producer track_a;
+		mlt_producer track_b;
+		mlt_tractor tractor = mlt_tractor_new( );
+		mlt_events_block( mlt_playlist_properties( this ), this );
+
+		track_a = mlt_producer_cut( clip_a->producer, clip_a->frame_out - length + 1, clip_a->frame_out );
+		mlt_properties_set_int( mlt_producer_properties( track_a ), "cut", 1 );
+		track_b = mlt_producer_cut( clip_b->producer, clip_b->frame_in, clip_b->frame_in + length - 1 );
+		mlt_properties_set_int( mlt_producer_properties( track_b ), "cut", 1 );
+
+		mlt_playlist_resize_clip( this, clip, clip_a->frame_in, clip_a->frame_out - length + 1 );
+		mlt_playlist_resize_clip( this, clip + 1, clip_b->frame_in + length, clip_b->frame_out );
+
+		mlt_tractor_set_track( tractor, track_a, 0 );
+		mlt_tractor_set_track( tractor, track_b, 1 );
+		mlt_playlist_insert( this, mlt_tractor_producer( tractor ), clip + 1, -1, -1 );
+		mlt_properties_set_data( mlt_tractor_properties( tractor ), "mlt_mix", tractor, 0, NULL, NULL );
+
+		if ( transition != NULL )
+		{
+			mlt_field field = mlt_tractor_field( tractor );
+			mlt_field_plant_transition( field, transition, 0, 1 );
+			mlt_transition_set_in_and_out( transition, 0, length - 1 );
+		}
+
+		if ( clip_b->frame_count <= 0 )
+			mlt_playlist_remove( this, clip + 2 );
+
+		if ( clip_a->frame_count <= 0 )
+			mlt_playlist_remove( this, clip );
+
+		mlt_events_unblock( mlt_playlist_properties( this ), this );
+		mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL );
+		mlt_producer_close( track_a );
+		mlt_producer_close( track_b );
+		mlt_tractor_close( tractor );
+	}
+	return error;
+}
+
+static int mlt_playlist_unmix( mlt_playlist this, int clip )
+{
+	int error = ( clip < 0 || clip >= this->count ); 
+
+	// Ensure that the clip request is actually a mix
+	if ( error == 0 )
+	{
+		mlt_producer producer = this->list[ clip ]->producer;
+		mlt_properties properties = mlt_producer_properties( producer );
+		error = !mlt_properties_get_int( properties, "mlt_mix" );
+	}
+
+	if ( error == 0 )
+	{
+		playlist_entry *mix = this->list[ clip ];
+		playlist_entry *clip_a = mix->mix_in;
+		playlist_entry *clip_b = mix->mix_out;
+		int length = mix->mix_in_length;
+		mlt_events_block( mlt_playlist_properties( this ), this );
+
+		if ( clip_a != NULL )
+		{
+			clip_a->frame_out += length;
+			clip_a->frame_count += length;
+			clip_a->mix_out = NULL;
+			clip_a->mix_out_length = 0;
+		}
+		else
+		{
+			mlt_tractor tractor = ( mlt_tractor )mix->producer;
+			mlt_playlist playlist = ( mlt_playlist )mlt_tractor_get_track( tractor, 0 );
+			mlt_producer producer = playlist->list[ 0 ]->producer;
+			mlt_playlist_insert( this, producer, clip, playlist->list[0]->frame_in, playlist->list[0]->frame_out );
+			clip ++;
+		}
+
+		if ( clip_b != NULL )
+		{
+			clip_b->frame_in -= length;
+			clip_b->frame_count += length;
+			clip_b->mix_in = NULL;
+			clip_b->mix_in_length = 0;
+		}
+		else
+		{
+			mlt_tractor tractor = ( mlt_tractor )mix->producer;
+			mlt_playlist playlist = ( mlt_playlist )mlt_tractor_get_track( tractor, 1 );
+			mlt_producer producer = playlist->list[ 0 ]->producer;
+			mlt_playlist_insert( this, producer, clip + 1, playlist->list[0]->frame_in, playlist->list[0]->frame_out );
+		}
+
+		mlt_properties_set_int( mlt_producer_properties( mix->producer ), "mlt_mix", 0 );
+		mlt_playlist_remove( this, clip );
+		mlt_events_unblock( mlt_playlist_properties( this ), this );
+		mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL );
+	}
+	return error;
+}
+
+static int mlt_playlist_resize_mix( mlt_playlist this, int clip, int in, int out )
+{
+	int error = ( clip < 0 || clip >= this->count ); 
+
+	// Ensure that the clip request is actually a mix
+	if ( error == 0 )
+	{
+		mlt_producer producer = this->list[ clip ]->producer;
+		mlt_properties properties = mlt_producer_properties( producer );
+		error = !mlt_properties_get_int( properties, "mlt_mix" );
+	}
+
+	if ( error == 0 )
+	{
+		playlist_entry *mix = this->list[ clip ];
+		playlist_entry *clip_a = mix->mix_in;
+		playlist_entry *clip_b = mix->mix_out;
+		int length = out - in + 1;
+		int length_diff = length - mix->mix_in_length;
+		mlt_events_block( mlt_playlist_properties( this ), this );
+
+		if ( clip_a != NULL )
+		{
+			clip_a->frame_out -= length_diff;
+			clip_a->frame_count -= length_diff;
+			clip_a->mix_out_length -= length_diff;
+		}
+
+		if ( clip_b != NULL )
+		{
+			clip_b->frame_in += length_diff;
+			clip_b->frame_count -= length_diff;
+			clip_b->mix_in_length -= length_diff;
+		}
+
+		mix->frame_in = 0;
+		mix->frame_out = length - 1;
+		mix->frame_count = length;
+		mix->mix_in_length = length;
+		mix->mix_out_length = length;
+
+		mlt_events_unblock( mlt_playlist_properties( this ), this );
+		mlt_events_fire( mlt_playlist_properties( this ), "producer-changed", NULL );
 	}
 	return error;
 }
@@ -509,10 +944,10 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 	mlt_playlist this = producer->child;
 
 	// Get the real producer
-	mlt_producer real = mlt_playlist_virtual_seek( this );
+	mlt_service real = mlt_playlist_virtual_seek( this );
 
 	// Get the frame
-	mlt_service_get_frame( mlt_producer_service( real ), frame, index );
+	mlt_service_get_frame( real, frame, index );
 
 	// Check if we're at the end of the clip
 	mlt_properties properties = mlt_frame_properties( *frame );
@@ -528,8 +963,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 		notifier( argument );
 	}
 
-	// Update timecode on the frame we're creating
-	mlt_frame_set_timecode( *frame, mlt_producer_position( producer ) );
+	// Update position on the frame we're creating
+	mlt_frame_set_position( *frame, mlt_producer_frame( producer ) );
 
 	// Position ourselves on the next frame
 	mlt_producer_prepare_next( producer );
@@ -542,7 +977,19 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 
 void mlt_playlist_close( mlt_playlist this )
 {
-	mlt_producer_close( &this->parent );
-	mlt_producer_close( &this->blank );
-	free( this );
+	if ( this != NULL && mlt_properties_dec_ref( mlt_playlist_properties( this ) ) <= 0 )
+	{
+		int i = 0;
+		this->parent.close = NULL;
+		for ( i = 0; i < this->count; i ++ )
+		{
+			mlt_event_close( this->list[ i ]->event );
+			mlt_producer_close( this->list[ i ]->producer );
+			free( this->list[ i ] );
+		}
+		mlt_producer_close( &this->blank );
+		mlt_producer_close( &this->parent );
+		free( this->list );
+		free( this );
+	}
 }