X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=30ec118f6e48b11f3d1af3ec73f55fd91b2d7569;hb=263782cae3c9917d957f71cde4b9a63080f8da9f;hp=fdfcdc240892b032dae703c22fbef6fa1a5ccfae;hpb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;p=melted

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index fdfcdc2..30ec118 100644
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "consumer_sdl.h"
+#include <framework/mlt_consumer.h>
 #include <framework/mlt_frame.h>
 #include <framework/mlt_deque.h>
 #include <framework/mlt_factory.h>
@@ -81,13 +81,13 @@ static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt
 	via the argument, but keep it simple.
 */
 
-mlt_consumer consumer_sdl_init( char *arg )
+mlt_consumer consumer_sdl_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	// Create the consumer object
 	consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 );
 
 	// If no malloc'd and consumer init ok
-	if ( this != NULL && mlt_consumer_init( &this->parent, this ) == 0 )
+	if ( this != NULL && mlt_consumer_init( &this->parent, this, profile ) == 0 )
 	{
 		// Create the queue
 		this->queue = mlt_deque_init( );
@@ -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;
 
@@ -185,18 +178,24 @@ int consumer_start( mlt_consumer parent )
 		this->running = 1;
 		this->joined = 0;
 
-		this->width = mlt_properties_get_int( this->properties, "width" );
-		this->height = mlt_properties_get_int( this->properties, "height" );
+		if ( mlt_properties_get_int( this->properties, "width" ) > 0 )
+			this->width = mlt_properties_get_int( this->properties, "width" );
+		if ( mlt_properties_get_int( this->properties, "height" ) > 0 )
+			this->height = mlt_properties_get_int( this->properties, "height" );
 
 		this->bpp = mlt_properties_get_int( this->properties, "bpp" );
 
 		// Attach a colour space converter
 		if ( preview_off && !this->filtered )
 		{
-			mlt_filter filter = mlt_factory_filter( "avcolour_space", NULL );
-			mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "forced", mlt_image_yuv422 );
-			mlt_service_attach( MLT_CONSUMER_SERVICE( parent ), filter );
-			mlt_filter_close( filter );
+			mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( parent ) );
+			mlt_filter filter = mlt_factory_filter( profile, "avcolour_space", NULL );
+			if ( filter )
+			{
+				mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "forced", mlt_image_yuv422 );
+				mlt_service_attach( MLT_CONSUMER_SERVICE( parent ), filter );
+				mlt_filter_close( filter );
+			}
 			this->filtered = 1;
 		}
 	
@@ -219,8 +218,23 @@ 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 )
+		{
+			if ( mlt_properties_get_int( this->properties, "fullscreen" ) )
+			{
+				const SDL_VideoInfo *vi = SDL_GetVideoInfo();
+				this->window_width = vi->current_w;
+				this->window_height = vi->current_h;
+				this->sdl_flags |= SDL_FULLSCREEN;
+				SDL_ShowCursor( SDL_DISABLE );
+			}
 			this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+		}
 
 		pthread_create( &this->thread, NULL, consumer_thread, this );
 	}
@@ -238,7 +252,8 @@ int consumer_stop( mlt_consumer parent )
 		// Kill the thread and clean up
 		this->joined = 1;
 		this->running = 0;
-		pthread_join( this->thread, NULL );
+		if ( this->thread )
+			pthread_join( this->thread, NULL );
 
 		// internal cleanup
 		if ( this->sdl_overlay != NULL )