X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_still.c;h=202b4345a56273d6eabfe60887e8188735e6c44b;hb=bb2674a23b551cbc146d40ff7a122c87856b49ff;hp=433ba896d449b77df2c56074f42273a6f2dc40ab;hpb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;p=melted

diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c
index 433ba89..202b434 100644
--- a/src/modules/sdl/consumer_sdl_still.c
+++ b/src/modules/sdl/consumer_sdl_still.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>
@@ -72,13 +72,13 @@ static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt
 	via the argument, but keep it simple.
 */
 
-mlt_consumer consumer_sdl_still_init( char *arg )
+mlt_consumer consumer_sdl_still_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 )
 	{
 		// Get the parent consumer object
 		mlt_consumer parent = &this->parent;
@@ -87,9 +87,6 @@ mlt_consumer consumer_sdl_still_init( char *arg )
 		mlt_service service = MLT_CONSUMER_SERVICE( parent );
 		this->properties = MLT_SERVICE_PROPERTIES( service );
 
-		// Get the default display ratio
-		double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
-
 		// We have stuff to clean up, so override the close method
 		parent->close = consumer_close;
 
@@ -117,10 +114,6 @@ mlt_consumer consumer_sdl_still_init( char *arg )
 			mlt_properties_set_int( this->properties, "height", this->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;
 
@@ -161,7 +154,8 @@ static int consumer_start( mlt_consumer parent )
 		// Attach a colour space converter
 		if ( !this->filtered )
 		{
-			mlt_filter filter = mlt_factory_filter( "avcolour_space", NULL );
+			mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( parent ) );
+			mlt_filter filter = mlt_factory_filter( profile, "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 );
@@ -178,6 +172,11 @@ static int consumer_start( mlt_consumer parent )
 		this->width = mlt_properties_get_int( this->properties, "width" );
 		this->height = mlt_properties_get_int( this->properties, "height" );
 
+		// 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 ( sdl_started == 0 && preview_off == 0 )
 		{
 			if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
@@ -194,7 +193,6 @@ static int consumer_start( mlt_consumer parent )
 			if ( SDL_GetVideoSurface( ) != NULL )
 			{
 				this->sdl_screen = SDL_GetVideoSurface( );
-				consumer_get_dimensions( &this->window_width, &this->window_height );
 			}
 		}
 
@@ -433,6 +431,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 		this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
 		if ( consumer_get_dimensions( &this->window_width, &this->window_height ) )
 			this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+		uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
+		SDL_FillRect( this->sdl_screen, NULL, color >> 8 );
 		changed = 1;
 	}
 	else
@@ -494,8 +494,6 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 	
 	if ( !mlt_consumer_is_stopped( &this->parent ) && SDL_GetVideoSurface( ) != NULL && this->sdl_screen != NULL && this->sdl_screen->pixels != NULL )
 	{
-		memset( this->sdl_screen->pixels, 0, this->window_width * this->window_height * this->sdl_screen->format->BytesPerPixel );
-
 		switch( this->sdl_screen->format->BytesPerPixel )
 		{
 			case 1: