X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_playlist.c;h=eb89f04c2c9ed4d1283388b127d049d029dc80ba;hb=03934f3d3b3c8aa162ef066020bdbfaaf7b30247;hp=ffcb3d56c685b975c3bac1bceaa8a5f005c1205a;hpb=661165812e3410fe2f6f49d7af882b36a0efcf82;p=melted

diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c
index ffcb3d5..eb89f04 100644
--- a/src/framework/mlt_playlist.c
+++ b/src/framework/mlt_playlist.c
@@ -21,6 +21,20 @@
 #include "config.h"
 
 #include "mlt_playlist.h"
+#include "mlt_frame.h"
+
+#include <stdlib.h>
+
+/** Virtual playlist entry.
+*/
+
+typedef struct
+{
+	mlt_producer producer;
+	mlt_timecode in;
+	mlt_timecode playtime;
+}
+playlist_entry;
 
 /** Private definition.
 */
@@ -28,14 +42,19 @@
 struct mlt_playlist_s
 {
 	struct mlt_producer_s parent;
+	struct mlt_producer_s blank;
+
+	int size;
 	int count;
-	int track;
+	playlist_entry **list;
 };
 
-/** Constructor.
+/** Forward declarations
+*/
 
-	TODO: Override and implement all transport related method.
-	TODO: Override and implement a time code normalising service get_frame
+static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index );
+
+/** Constructor.
 */
 
 mlt_playlist mlt_playlist_init( )
@@ -44,11 +63,15 @@ mlt_playlist mlt_playlist_init( )
 	if ( this != NULL )
 	{
 		mlt_producer producer = &this->parent;
-		if ( mlt_producer_init( producer, this ) != 0 )
-		{
-			free( this );
-			this = NULL;
-		}
+
+		// Construct the producer
+		mlt_producer_init( producer, this );
+
+		// Override the producer get_frame
+		producer->get_frame = producer_get_frame;
+
+		// Initialise blank
+		mlt_producer_init( &this->blank, NULL );
 	}
 	
 	return this;
@@ -70,32 +93,114 @@ mlt_service mlt_playlist_service( mlt_playlist this )
 	return mlt_producer_service( &this->parent );
 }
 
-/** Append a producer to the playlist.
+/** Append to the virtual playlist.
+*/
+
+static int mlt_playlist_virtual_append( mlt_playlist this, mlt_producer producer, mlt_timecode in, mlt_timecode out )
+{
+	// 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;
+		this->size += 10;
+	}
+
+	this->list[ this->count ] = calloc( sizeof( playlist_entry ), 1 );
+	this->list[ this->count ]->producer = producer;
+	this->list[ this->count ]->in = in;
+	this->list[ this->count ]->playtime = out - in;
+
+	this->count ++;
+
+	return 0;
+}
+
+/** Seek in the virtual playlist.
+*/
+
+static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this )
+{
+	// Default producer to blank
+	mlt_producer producer = &this->blank;
+
+	// Map playlist position to real producer in virtual playlist
+	mlt_timecode position = mlt_producer_position( &this->parent );
+
+	// Loop through the virtual playlist
+	int i = 0;
+
+	for ( i = 0; i < this->count; i ++ )
+	{
+		if ( position < this->list[ i ]->playtime )
+		{
+			// Found it, now break
+			producer = this->list[ i ]->producer;
+			position += this->list[ i ]->in;
+			break;
+		}
+		else
+		{
+			// Decrement position by length of this entry
+			position -= this->list[ i ]->playtime;
+		}
+	}
+
+	// Seek in real producer to relative position
+	mlt_producer_seek( producer, position );
+
+	return producer;
+}
 
-	TODO: Implement
-	TODO: Extract length information from the producer.
+/** Append a producer to the playlist.
 */
 
 int mlt_playlist_append( mlt_playlist this, mlt_producer producer )
 {
-	return 0;
+	// Append to virtual list
+	return mlt_playlist_virtual_append( this, producer, 0, mlt_producer_get_playtime( producer ) );
 }
 
 /** Append a blank to the playlist of a given length.
-
-	TODO: Implement
 */
 
 int mlt_playlist_blank( mlt_playlist this, mlt_timecode length )
 {
+	// Append to the virtual list
+	return mlt_playlist_virtual_append( this, &this->blank, 0, length );
+}
+
+/** Get the current frame.
+*/
+
+static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
+{
+	// Get this mlt_playlist
+	mlt_playlist this = producer->child;
+
+	// Get the real producer
+	mlt_producer real = mlt_playlist_virtual_seek( this );
+
+	// Get the frame
+	mlt_service_get_frame( mlt_producer_service( real ), frame, index );
+
+	// Update timecode on the frame we're creating
+	mlt_frame_set_timecode( *frame, mlt_producer_position( producer ) );
+
+	// Position ourselves on the next frame
+	mlt_producer_prepare_next( producer );
+
 	return 0;
 }
 
 /** Close the playlist.
 */
 
-mlt_playlist_close( mlt_playlist this )
+void mlt_playlist_close( mlt_playlist this )
 {
 	mlt_producer_close( &this->parent );
+	mlt_producer_close( &this->blank );
 	free( this );
 }