From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Sun, 11 Jan 2004 09:18:14 +0000 (+0000)
Subject: eof=continue and eof=pause
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=1b5b040dcc51d66252efd82968889b1d2b929930;p=melted

eof=continue and eof=pause


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@52 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/mlt/src/framework/mlt_multitrack.c b/mlt/src/framework/mlt_multitrack.c
index 9db2aad..b357546 100644
--- a/mlt/src/framework/mlt_multitrack.c
+++ b/mlt/src/framework/mlt_multitrack.c
@@ -160,6 +160,10 @@ int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int trac
 
 	if ( result == 0 )
 	{
+		// If it's a playlist, we need to make sure it doesn't pause at end
+		mlt_properties properties = mlt_producer_properties( producer );
+		mlt_properties_set( properties, "eof", "continue" );
+
 		// Resize the producer list if need be
 		if ( track >= this->size )
 		{
diff --git a/mlt/src/framework/mlt_playlist.c b/mlt/src/framework/mlt_playlist.c
index 00c98cd..798c9ed 100644
--- a/mlt/src/framework/mlt_playlist.c
+++ b/mlt/src/framework/mlt_playlist.c
@@ -79,6 +79,9 @@ mlt_playlist mlt_playlist_init( )
 
 		// 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" );
 	}
 	
 	return this;
@@ -194,6 +197,9 @@ static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this )
 	int64_t position = mlt_producer_frame_position( &this->parent, pos );
 	int64_t total = 0;
 
+	mlt_properties properties = mlt_playlist_properties( this );
+	char *eof = mlt_properties_get( properties, "eof" );
+
 	// Loop through the virtual playlist
 	int i = 0;
 
@@ -222,14 +228,15 @@ static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this )
 		position += mlt_producer_frame_position( producer, mlt_producer_get_in( producer ) );
 		mlt_producer_seek_frame( producer, position );
 	}
-	else if ( total > 0 )
+	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 );
+		mlt_producer_seek_frame( this_producer, total - 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_set_speed( producer, 0 );
 	}
 	else
 	{
diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c
index 9db2aad..b357546 100644
--- a/src/framework/mlt_multitrack.c
+++ b/src/framework/mlt_multitrack.c
@@ -160,6 +160,10 @@ int mlt_multitrack_connect( mlt_multitrack this, mlt_producer producer, int trac
 
 	if ( result == 0 )
 	{
+		// If it's a playlist, we need to make sure it doesn't pause at end
+		mlt_properties properties = mlt_producer_properties( producer );
+		mlt_properties_set( properties, "eof", "continue" );
+
 		// Resize the producer list if need be
 		if ( track >= this->size )
 		{
diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c
index 00c98cd..798c9ed 100644
--- a/src/framework/mlt_playlist.c
+++ b/src/framework/mlt_playlist.c
@@ -79,6 +79,9 @@ mlt_playlist mlt_playlist_init( )
 
 		// 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" );
 	}
 	
 	return this;
@@ -194,6 +197,9 @@ static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this )
 	int64_t position = mlt_producer_frame_position( &this->parent, pos );
 	int64_t total = 0;
 
+	mlt_properties properties = mlt_playlist_properties( this );
+	char *eof = mlt_properties_get( properties, "eof" );
+
 	// Loop through the virtual playlist
 	int i = 0;
 
@@ -222,14 +228,15 @@ static mlt_producer mlt_playlist_virtual_seek( mlt_playlist this )
 		position += mlt_producer_frame_position( producer, mlt_producer_get_in( producer ) );
 		mlt_producer_seek_frame( producer, position );
 	}
-	else if ( total > 0 )
+	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 );
+		mlt_producer_seek_frame( this_producer, total - 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_set_speed( producer, 0 );
 	}
 	else
 	{