X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_preview.c;h=ec383ab2e06c57eacc201770e83fcd520665113b;hb=cab7cd53c3a4d9c4355751088fec61860dcabbce;hp=66aaf7e21015ab11b041a745295986dbc743a61c;hpb=3dbc8c2612d74b25557cc343eaf85ebdf262b91d;p=melted

diff --git a/src/modules/sdl/consumer_sdl_preview.c b/src/modules/sdl/consumer_sdl_preview.c
index 66aaf7e..ec383ab 100644
--- a/src/modules/sdl/consumer_sdl_preview.c
+++ b/src/modules/sdl/consumer_sdl_preview.c
@@ -45,6 +45,7 @@ struct consumer_sdl_s
 
 	pthread_cond_t refresh_cond;
 	pthread_mutex_t refresh_mutex;
+	int refresh_count;
 };
 
 /** Forward references to static functions.
@@ -121,12 +122,10 @@ static void consumer_refresh_cb( mlt_consumer sdl, mlt_consumer parent, char *na
 	if ( !strcmp( name, "refresh" ) )
 	{
 		consumer_sdl this = parent->child;
-		if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "refresh" ) )
-		{
-			pthread_mutex_lock( &this->refresh_mutex );
-			pthread_cond_broadcast( &this->refresh_cond );
-			pthread_mutex_unlock( &this->refresh_mutex );
-		}
+		pthread_mutex_lock( &this->refresh_mutex );
+		this->refresh_count = this->refresh_count <= 0 ? 1 : this->refresh_count ++;
+		pthread_cond_broadcast( &this->refresh_cond );
+		pthread_mutex_unlock( &this->refresh_mutex );
 	}
 }
 
@@ -258,7 +257,6 @@ static void *consumer_thread( void *arg )
 		// Get a frame from the attached producer
 		frame = mlt_consumer_get_frame( consumer );
 
-
 		// Ensure that we have a frame
 		if ( frame != NULL )
 		{
@@ -271,11 +269,13 @@ static void *consumer_thread( void *arg )
 			// Lock during the operation
 			mlt_service_lock( MLT_CONSUMER_SERVICE( consumer ) );
 
-			// Get refresh request for the current frame (effect changes in still mode)
+			// Get refresh request for the current frame
 			int refresh = mlt_properties_get_int( properties, "refresh" );
 
 			// Decrement refresh and clear changed
-			mlt_properties_set_int( properties, "refresh", refresh > 0 ? refresh - 1 : 0 );
+			mlt_events_block( properties, properties );
+			mlt_properties_set_int( properties, "refresh", 0 );
+			mlt_events_unblock( properties, properties );
 
 			// Unlock after the operation
 			mlt_service_unlock( MLT_CONSUMER_SERVICE( consumer ) );
@@ -289,12 +289,13 @@ static void *consumer_thread( void *arg )
 			// Optimisation to reduce latency
 			if ( speed == 1.0 )
 			{
-				//if ( last_position != -1 && last_position + 1 != mlt_frame_get_position( frame ) )
-					//mlt_consumer_purge( this->play );
+				if ( last_position != -1 && last_position + 1 != mlt_frame_get_position( frame ) )
+					mlt_consumer_purge( this->play );
 				last_position = mlt_frame_get_position( frame );
 			}
 			else
 			{
+				//mlt_consumer_purge( this->play );
 				last_position = -1;
 			}
 
@@ -353,20 +354,25 @@ static void *consumer_thread( void *arg )
 			if ( this->active == this->still )
 			{
 				pthread_mutex_lock( &this->refresh_mutex );
-				if ( speed == 0 && mlt_properties_get_int( properties, "refresh" ) == 0 )
+				if ( speed == 0 && this->refresh_count == 0 )
 					pthread_cond_wait( &this->refresh_cond, &this->refresh_mutex );
+				this->refresh_count = 0;
 				pthread_mutex_unlock( &this->refresh_mutex );
 			}
 
 			// We are definitely not waiting on the first frame any more
 			first = 0;
 		}
+		else
+		{
+			this->running = 0;
+		}
 	}
 
-	mlt_consumer_stop( this->play );
-	mlt_consumer_stop( this->still );
+	//mlt_consumer_stop( this->play );
+	//mlt_consumer_stop( this->still );
 
-	SDL_Quit( );
+	//SDL_Quit( );
 
 	return NULL;
 }
@@ -382,13 +388,13 @@ static void consumer_close( mlt_consumer parent )
 	// Stop the consumer
 	mlt_consumer_stop( parent );
 
-	// Now clean up the rest
-	mlt_consumer_close( parent );
-
 	// Close the child consumers
 	mlt_consumer_close( this->play );
 	mlt_consumer_close( this->still );
 
+	// Now clean up the rest
+	mlt_consumer_close( parent );
+
 	// Finally clean up this
 	free( this );
 }