X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=70e65d9cf3ca13204ce25c69ac68116b0e6c58fa;hb=40b169c095486ba1b868486eb98a47c41f36ce8c;hp=2d46db0be281c901d20cf909bb811d87e9e6172a;hpb=eccf04749681f70957f34fdd6742224774e72d15;p=melted

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 2d46db0..70e65d9 100644
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Dan Dennedy <dan@dennedy.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "consumer_sdl.h"
@@ -102,9 +102,6 @@ mlt_consumer consumer_sdl_init( char *arg )
 		mlt_service service = MLT_CONSUMER_SERVICE( parent );
 		this->properties = MLT_SERVICE_PROPERTIES( service );
 
-		// Default display aspect ratio
-		double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
-		
 		// Set the default volume
 		mlt_properties_set_double( this->properties, "volume", 1.0 );
 
@@ -136,10 +133,6 @@ mlt_consumer consumer_sdl_init( char *arg )
 			this->height = mlt_properties_get_int( this->properties, "height" );
 		}
 
-		// Default window size
-		this->window_width = ( double )this->height * display_ratio;
-		this->window_height = this->height;
-
 		// Set the sdl flags
 		this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
 
@@ -219,6 +212,11 @@ int consumer_start( mlt_consumer parent )
 		if ( audio_off == 0 )
 			SDL_InitSubSystem( SDL_INIT_AUDIO );
 
+		// Default window size
+		double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
+		this->window_width = ( double )this->height * display_ratio;
+		this->window_height = this->height;
+
 		if ( this->sdl_screen == NULL && display_off == 0 )
 			this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
 
@@ -246,7 +244,12 @@ int consumer_stop( mlt_consumer parent )
 		this->sdl_overlay = NULL;
 
 		if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) )
+		{
+			pthread_mutex_lock( &this->audio_mutex );
+			pthread_cond_broadcast( &this->audio_cond );
+			pthread_mutex_unlock( &this->audio_mutex );
 			SDL_QuitSubSystem( SDL_INIT_AUDIO );
+		}
 
 		if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
 			SDL_Quit( );
@@ -534,6 +537,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 			
 			this->rect.x = ( this->window_width - this->rect.w ) / 2;
 			this->rect.y = ( this->window_height - this->rect.h ) / 2;
+			this->rect.x -= this->rect.x % 2;
 
 			mlt_properties_set_int( this->properties, "rect_x", this->rect.x );
 			mlt_properties_set_int( this->properties, "rect_y", this->rect.y );
@@ -677,6 +681,10 @@ static void *consumer_thread( void *arg )
 	// Get the consumer
 	mlt_consumer consumer = &this->parent;
 
+	// Convenience functionality
+	int terminate_on_pause = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "terminate_on_pause" );
+	int terminated = 0;
+
 	// Video thread
 	pthread_t thread;
 
@@ -690,11 +698,15 @@ static void *consumer_thread( void *arg )
 	struct timespec tm = { 0, 100000 };
 
 	// Loop until told not to
-	while( this->running )
+	while( !terminated && this->running )
 	{
 		// Get a frame from the attached producer
 		frame = mlt_consumer_rt_frame( consumer );
 
+		// Check for termination
+		if ( terminate_on_pause && frame != NULL )
+			terminated = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0.0;
+
 		// Ensure that we have a frame
 		if ( frame != NULL )
 		{
@@ -731,6 +743,8 @@ static void *consumer_thread( void *arg )
 		}
 	}
 
+	this->running = 0;
+
 	// Kill the video thread
 	if ( init_video == 0 )
 	{