Diffstat (limited to 'noncore/multimedia/opieplayer2/nullvideo.c') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 60 |
1 files changed, 32 insertions, 28 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 9c285a0..1ebb854 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c | |||
@@ -61,3 +61,3 @@ typedef struct null_driver_s null_driver_t; | |||
61 | struct null_driver_s { | 61 | struct null_driver_s { |
62 | xine_vo_driver_t vo_driver; | 62 | vo_driver_t vo_driver; |
63 | 63 | ||
@@ -109,3 +109,3 @@ struct opie_frame_s { | |||
109 | 109 | ||
110 | static uint32_t null_get_capabilities( xine_vo_driver_t *self ){ | 110 | static uint32_t null_get_capabilities( vo_driver_t *self ){ |
111 | null_driver_t* this = (null_driver_t*)self; | 111 | null_driver_t* this = (null_driver_t*)self; |
@@ -165,3 +165,3 @@ static void null_frame_dispose( vo_frame_t* vo_img){ | |||
165 | 165 | ||
166 | static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){ | 166 | static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ |
167 | 167 | ||
@@ -197,3 +197,3 @@ static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){ | |||
197 | 197 | ||
198 | static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | 198 | static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, |
199 | uint32_t width, uint32_t height, | 199 | uint32_t width, uint32_t height, |
@@ -340,3 +340,3 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | |||
340 | 340 | ||
341 | static void null_display_frame( xine_vo_driver_t* self, vo_frame_t *frame_gen ){ | 341 | static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ |
342 | null_driver_t* this = (null_driver_t*) self; | 342 | null_driver_t* this = (null_driver_t*) self; |
@@ -383,3 +383,3 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this, | |||
383 | 383 | ||
384 | static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { | 384 | static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { |
385 | null_driver_t *this = (null_driver_t *) this_gen; | 385 | null_driver_t *this = (null_driver_t *) this_gen; |
@@ -420,3 +420,3 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g | |||
420 | 420 | ||
421 | static int null_get_property( xine_vo_driver_t* self, | 421 | static int null_get_property( vo_driver_t* self, |
422 | int property ){ | 422 | int property ){ |
@@ -424,3 +424,3 @@ static int null_get_property( xine_vo_driver_t* self, | |||
424 | } | 424 | } |
425 | static int null_set_property( xine_vo_driver_t* self, | 425 | static int null_set_property( vo_driver_t* self, |
426 | int property, | 426 | int property, |
@@ -429,3 +429,3 @@ static int null_set_property( xine_vo_driver_t* self, | |||
429 | } | 429 | } |
430 | static void null_get_property_min_max( xine_vo_driver_t* self, | 430 | static void null_get_property_min_max( vo_driver_t* self, |
431 | int property, int *min, | 431 | int property, int *min, |
@@ -435,3 +435,3 @@ static void null_get_property_min_max( xine_vo_driver_t* self, | |||
435 | } | 435 | } |
436 | static int null_gui_data_exchange( xine_vo_driver_t* self, | 436 | static int null_gui_data_exchange( vo_driver_t* self, |
437 | int data_type, | 437 | int data_type, |
@@ -441,3 +441,3 @@ static int null_gui_data_exchange( xine_vo_driver_t* self, | |||
441 | 441 | ||
442 | static void null_dispose ( xine_vo_driver_t* self ){ | 442 | static void null_dispose ( vo_driver_t* self ){ |
443 | null_driver_t* this = (null_driver_t*)self; | 443 | null_driver_t* this = (null_driver_t*)self; |
@@ -445,3 +445,3 @@ static void null_dispose ( xine_vo_driver_t* self ){ | |||
445 | } | 445 | } |
446 | static int null_redraw_needed( xine_vo_driver_t* self ){ | 446 | static int null_redraw_needed( vo_driver_t* self ){ |
447 | return 0; | 447 | return 0; |
@@ -450,4 +450,4 @@ static int null_redraw_needed( xine_vo_driver_t* self ){ | |||
450 | 450 | ||
451 | xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, | 451 | xine_vo_driver_t* init_video_out_plugin( xine_t *xine, |
452 | void* video ){ | 452 | void* video, display_xine_frame_t frameDisplayFunc, void *userData ){ |
453 | null_driver_t *vo; | 453 | null_driver_t *vo; |
@@ -458,3 +458,3 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, | |||
458 | 458 | ||
459 | vo_scale_init (&vo->sc, 0, 0); | 459 | vo_scale_init (&vo->sc, 0, 0, xine->config); |
460 | 460 | ||
@@ -489,3 +489,7 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, | |||
489 | 489 | ||
490 | return ( xine_vo_driver_t*) vo; | 490 | vo->caller = userData; |
491 | vo->frameDis = frameDisplayFunc; | ||
492 | |||
493 | /* return ( vo_driver_t*) vo; */ | ||
494 | return vo_new_port( xine, ( vo_driver_t* )vo ); | ||
491 | } | 495 | } |
@@ -514,3 +518,3 @@ vo_info_t *get_video_out_plugin_info(){ | |||
514 | int null_is_showing_video( xine_vo_driver_t* self ){ | 518 | int null_is_showing_video( xine_vo_driver_t* self ){ |
515 | null_driver_t* this = (null_driver_t*)self; | 519 | null_driver_t* this = (null_driver_t*)self->driver; |
516 | return this->m_show_video; | 520 | return this->m_show_video; |
@@ -518,3 +522,3 @@ int null_is_showing_video( xine_vo_driver_t* self ){ | |||
518 | void null_set_show_video( xine_vo_driver_t* self, int show ) { | 522 | void null_set_show_video( xine_vo_driver_t* self, int show ) { |
519 | ((null_driver_t*)self)->m_show_video = show; | 523 | ((null_driver_t*)self->driver)->m_show_video = show; |
520 | } | 524 | } |
@@ -522,9 +526,9 @@ void null_set_show_video( xine_vo_driver_t* self, int show ) { | |||
522 | int null_is_fullscreen( xine_vo_driver_t* self ){ | 526 | int null_is_fullscreen( xine_vo_driver_t* self ){ |
523 | return ((null_driver_t*)self)->m_video_fullscreen; | 527 | return ((null_driver_t*)self->driver)->m_video_fullscreen; |
524 | } | 528 | } |
525 | void null_set_fullscreen( xine_vo_driver_t* self, int screen ){ | 529 | void null_set_fullscreen( xine_vo_driver_t* self, int screen ){ |
526 | ((null_driver_t*)self)->m_video_fullscreen = screen; | 530 | ((null_driver_t*)self->driver)->m_video_fullscreen = screen; |
527 | } | 531 | } |
528 | int null_is_scaling( xine_vo_driver_t* self ){ | 532 | int null_is_scaling( xine_vo_driver_t* self ){ |
529 | return ((null_driver_t*)self)->m_is_scaling; | 533 | return ((null_driver_t*)self->driver)->m_is_scaling; |
530 | } | 534 | } |
@@ -532,4 +536,4 @@ int null_is_scaling( xine_vo_driver_t* self ){ | |||
532 | void null_set_videoGamma( xine_vo_driver_t* self , int value ) { | 536 | void null_set_videoGamma( xine_vo_driver_t* self , int value ) { |
533 | ((null_driver_t*) self) ->yuv2rgb_gamma = value; | 537 | ((null_driver_t*) self->driver) ->yuv2rgb_gamma = value; |
534 | ((null_driver_t*) self) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self) ->yuv2rgb_factory, value ); | 538 | ((null_driver_t*) self->driver) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self) ->yuv2rgb_factory, value ); |
535 | } | 539 | } |
@@ -537,3 +541,3 @@ void null_set_videoGamma( xine_vo_driver_t* self , int value ) { | |||
537 | void null_set_scaling( xine_vo_driver_t* self, int scale ) { | 541 | void null_set_scaling( xine_vo_driver_t* self, int scale ) { |
538 | ((null_driver_t*)self)->m_is_scaling = scale; | 542 | ((null_driver_t*)self->driver)->m_is_scaling = scale; |
539 | } | 543 | } |
@@ -541,6 +545,6 @@ void null_set_scaling( xine_vo_driver_t* self, int scale ) { | |||
541 | void null_set_gui_width( xine_vo_driver_t* self, int width ) { | 545 | void null_set_gui_width( xine_vo_driver_t* self, int width ) { |
542 | ((null_driver_t*)self)->gui_width = width; | 546 | ((null_driver_t*)self->driver)->gui_width = width; |
543 | } | 547 | } |
544 | void null_set_gui_height( xine_vo_driver_t* self, int height ) { | 548 | void null_set_gui_height( xine_vo_driver_t* self, int height ) { |
545 | ((null_driver_t*)self)->gui_height = height; | 549 | ((null_driver_t*)self->driver)->gui_height = height; |
546 | } | 550 | } |
@@ -549,3 +553,3 @@ void null_set_gui_height( xine_vo_driver_t* self, int height ) { | |||
549 | void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { | 553 | void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { |
550 | null_driver_t* this = (null_driver_t*)self; | 554 | null_driver_t* this = (null_driver_t*)self->driver; |
551 | 555 | ||
@@ -605,3 +609,3 @@ void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, | |||
605 | void* user_data ) { | 609 | void* user_data ) { |
606 | null_driver_t* this = (null_driver_t*) self; | 610 | null_driver_t* this = (null_driver_t*) self->driver; |
607 | this->caller = user_data; | 611 | this->caller = user_data; |