X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_preview.c;h=12b78782707f4c58195318f78bb4b412eda4de4e;hb=695c4e0c2fb1408b10f1578760be79822f76b7ca;hp=479774e23631dcecf0b7a09aa9428c9349dcc1b4;hpb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;p=melted diff --git a/src/modules/sdl/consumer_sdl_preview.c b/src/modules/sdl/consumer_sdl_preview.c index 479774e..12b7878 100644 --- a/src/modules/sdl/consumer_sdl_preview.c +++ b/src/modules/sdl/consumer_sdl_preview.c @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "consumer_sdl.h" +#include #include #include #include @@ -60,10 +60,10 @@ static void consumer_frame_show_cb( mlt_consumer sdl, mlt_consumer this, mlt_fra static void consumer_sdl_event_cb( mlt_consumer sdl, mlt_consumer this, SDL_Event *event ); static void consumer_refresh_cb( mlt_consumer sdl, mlt_consumer this, char *name ); -mlt_consumer consumer_sdl_preview_init( char *arg ) +mlt_consumer consumer_sdl_preview_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) { consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 ); - 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; @@ -83,8 +83,8 @@ mlt_consumer consumer_sdl_preview_init( char *arg ) } // Create child consumers - this->play = mlt_factory_consumer( "sdl", arg ); - this->still = mlt_factory_consumer( "sdl_still", arg ); + this->play = mlt_factory_consumer( profile, "sdl", arg ); + this->still = mlt_factory_consumer( profile, "sdl_still", arg ); mlt_properties_set( MLT_CONSUMER_PROPERTIES( parent ), "real_time", "0" ); mlt_properties_set( MLT_CONSUMER_PROPERTIES( parent ), "rescale", "nearest" ); parent->close = consumer_close; @@ -190,8 +190,8 @@ static int consumer_start( mlt_consumer parent ) mlt_properties_pass_list( still, properties, "resize,rescale,width,height,aspect_ratio,display_ratio" ); mlt_properties_pass_list( play, properties, "deinterlace_method" ); mlt_properties_pass_list( still, properties, "deinterlace_method" ); - mlt_properties_pass_list( play, properties, "preview_off,preview_format" ); - mlt_properties_pass_list( still, properties, "preview_off,preview_format" ); + mlt_properties_pass_list( play, properties, "preview_off,preview_format,window_background" ); + mlt_properties_pass_list( still, properties, "preview_off,preview_format,window_background" ); mlt_properties_pass( play, properties, "play." ); mlt_properties_pass( still, properties, "still." );