X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=e78e3295dd93733ab03d159364828269fa047c39;hb=4580365ba2f57f530aa4bdeb57788822fab09e2f;hp=06171b9cfaab2f092e0573a38c428a68e6a7bafc;hpb=245af2ef6564488632b77c6e9018519ba134a320;p=melted

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 06171b9..e78e329 100644
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -72,6 +72,7 @@ static int consumer_is_stopped( mlt_consumer parent );
 static void consumer_close( mlt_consumer parent );
 static void *consumer_thread( void * );
 static int consumer_get_dimensions( int *width, int *height );
+static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args );
 
 /** This is what will be called by the factory - anything can be passed in
 	via the argument, but keep it simple.
@@ -121,6 +122,9 @@ mlt_consumer consumer_sdl_init( char *arg )
 
 		// Get sample aspect ratio
 		this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" );
+
+		// Ensure we don't join on a non-running object
+		this->joined = 1;
 		
 		// Default display aspect ratio
 		this->display_aspect = 4.0 / 3.0;
@@ -130,27 +134,12 @@ mlt_consumer consumer_sdl_init( char *arg )
 		{
 			this->width = mlt_properties_get_int( this->properties, "width" );
 			this->height = mlt_properties_get_int( this->properties, "height" );
-			
-			// Default window size
-			this->window_width = ( float )this->height * this->display_aspect;
-			this->window_height = this->height;
-		}
-		else
-		{
-			if ( (int)( ( float )this->width / this->height * 1000 ) != 
-				 (int)( this->display_aspect * 1000 ) ) 
-			{
-				// Override these
-				this->display_aspect = ( float )this->width / this->height;
-				this->aspect_ratio = 1.0;
-				mlt_properties_set_double( this->properties, "aspect_ratio", this->aspect_ratio );
-			}
-			
-			// Set window size
-			this->window_width = this->width;
-			this->window_height = this->height;
 		}
 
+		// Default window size
+		this->window_width = ( float )this->height * this->display_aspect;
+		this->window_height = this->height;
+
 		// Set the sdl flags
 		this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
 
@@ -159,6 +148,9 @@ mlt_consumer consumer_sdl_init( char *arg )
 		parent->stop = consumer_stop;
 		parent->is_stopped = consumer_is_stopped;
 
+		// Register specific events
+		mlt_events_register( this->properties, "consumer-sdl-event", ( mlt_transmitter )consumer_sdl_event );
+
 		// Return the consumer produced
 		return parent;
 	}
@@ -170,6 +162,12 @@ mlt_consumer consumer_sdl_init( char *arg )
 	return NULL;
 }
 
+static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args )
+{
+	if ( listener != NULL )
+		listener( owner, this, ( SDL_Event * )args[ 0 ] );
+}
+
 int consumer_start( mlt_consumer parent )
 {
 	consumer_sdl this = parent->child;
@@ -178,6 +176,8 @@ int consumer_start( mlt_consumer parent )
 	{
 		pthread_attr_t thread_attributes;
 		
+		consumer_stop( parent );
+
 		this->running = 1;
 		this->joined = 0;
 
@@ -377,6 +377,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 	if ( mlt_properties_get_int( properties, "video_off" ) == 0 )
 	{
 		// Get the image, width and height
+		mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
 		mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
 		
 		// Handle events
@@ -388,6 +389,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 	
 			while ( SDL_PollEvent( &event ) )
 			{
+				mlt_events_fire( this->properties, "consumer-sdl-event", &event, NULL );
+
 				switch( event.type )
 				{
 					case SDL_VIDEORESIZE:
@@ -414,7 +417,10 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 			}
 		}
 	
-		if ( width != this->width || height != this->height || this->last_frame_aspect != mlt_frame_get_aspect_ratio( frame ) )
+		if ( width != this->width || height != this->height || 
+			 ( ( int )( this->last_frame_aspect * 1000 ) != ( int )( mlt_frame_get_aspect_ratio( frame ) * 1000 ) &&
+			 ( mlt_frame_get_aspect_ratio( frame ) != 1.0 || this->last_frame_aspect == 0.0 ) ) )
+
 		{
 			this->width = width;
 			this->height = height;