author | simon <simon> | 2002-12-11 12:56:46 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 12:56:46 (UTC) |
commit | aa9623e53bd86c2645103ebacc81262f372b73d7 (patch) (unidiff) | |
tree | d24f0b4b3a5e5fe2f13bb011fbeff0cd53f1955a | |
parent | 9b8e5d7c225ac2dd399e392d57e3d19348412e1a (diff) | |
download | opie-aa9623e53bd86c2645103ebacc81262f372b73d7.zip opie-aa9623e53bd86c2645103ebacc81262f372b73d7.tar.gz opie-aa9623e53bd86c2645103ebacc81262f372b73d7.tar.bz2 |
- oops, do the right cast in the gamma set method
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 1ebb854..c988854 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c | |||
@@ -490,97 +490,97 @@ xine_vo_driver_t* init_video_out_plugin( xine_t *xine, | |||
490 | vo->caller = userData; | 490 | vo->caller = userData; |
491 | vo->frameDis = frameDisplayFunc; | 491 | vo->frameDis = frameDisplayFunc; |
492 | 492 | ||
493 | /* return ( vo_driver_t*) vo; */ | 493 | /* return ( vo_driver_t*) vo; */ |
494 | return vo_new_port( xine, ( vo_driver_t* )vo ); | 494 | return vo_new_port( xine, ( vo_driver_t* )vo ); |
495 | } | 495 | } |
496 | 496 | ||
497 | #if 0 | 497 | #if 0 |
498 | static vo_info_t vo_info_null = { | 498 | static vo_info_t vo_info_null = { |
499 | 5, | 499 | 5, |
500 | XINE_VISUAL_TYPE_FB | 500 | XINE_VISUAL_TYPE_FB |
501 | }; | 501 | }; |
502 | 502 | ||
503 | vo_info_t *get_video_out_plugin_info(){ | 503 | vo_info_t *get_video_out_plugin_info(){ |
504 | vo_info_null.description = ("xine video output plugin using null device"); | 504 | vo_info_null.description = ("xine video output plugin using null device"); |
505 | return &vo_info_null; | 505 | return &vo_info_null; |
506 | } | 506 | } |
507 | 507 | ||
508 | #endif | 508 | #endif |
509 | 509 | ||
510 | /* this is special for this device */ | 510 | /* this is special for this device */ |
511 | /** | 511 | /** |
512 | * We know that we will be controled by the XINE LIB++ | 512 | * We know that we will be controled by the XINE LIB++ |
513 | */ | 513 | */ |
514 | 514 | ||
515 | /** | 515 | /** |
516 | * | 516 | * |
517 | */ | 517 | */ |
518 | int null_is_showing_video( xine_vo_driver_t* self ){ | 518 | int null_is_showing_video( xine_vo_driver_t* self ){ |
519 | null_driver_t* this = (null_driver_t*)self->driver; | 519 | null_driver_t* this = (null_driver_t*)self->driver; |
520 | return this->m_show_video; | 520 | return this->m_show_video; |
521 | } | 521 | } |
522 | 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 ) { |
523 | ((null_driver_t*)self->driver)->m_show_video = show; | 523 | ((null_driver_t*)self->driver)->m_show_video = show; |
524 | } | 524 | } |
525 | 525 | ||
526 | int null_is_fullscreen( xine_vo_driver_t* self ){ | 526 | int null_is_fullscreen( xine_vo_driver_t* self ){ |
527 | return ((null_driver_t*)self->driver)->m_video_fullscreen; | 527 | return ((null_driver_t*)self->driver)->m_video_fullscreen; |
528 | } | 528 | } |
529 | void null_set_fullscreen( xine_vo_driver_t* self, int screen ){ | 529 | void null_set_fullscreen( xine_vo_driver_t* self, int screen ){ |
530 | ((null_driver_t*)self->driver)->m_video_fullscreen = screen; | 530 | ((null_driver_t*)self->driver)->m_video_fullscreen = screen; |
531 | } | 531 | } |
532 | int null_is_scaling( xine_vo_driver_t* self ){ | 532 | int null_is_scaling( xine_vo_driver_t* self ){ |
533 | return ((null_driver_t*)self->driver)->m_is_scaling; | 533 | return ((null_driver_t*)self->driver)->m_is_scaling; |
534 | } | 534 | } |
535 | 535 | ||
536 | void null_set_videoGamma( xine_vo_driver_t* self , int value ) { | 536 | void null_set_videoGamma( xine_vo_driver_t* self , int value ) { |
537 | ((null_driver_t*) self->driver) ->yuv2rgb_gamma = value; | 537 | ((null_driver_t*) self->driver) ->yuv2rgb_gamma = value; |
538 | ((null_driver_t*) self->driver) ->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->driver) ->yuv2rgb_factory, value ); |
539 | } | 539 | } |
540 | 540 | ||
541 | void null_set_scaling( xine_vo_driver_t* self, int scale ) { | 541 | void null_set_scaling( xine_vo_driver_t* self, int scale ) { |
542 | ((null_driver_t*)self->driver)->m_is_scaling = scale; | 542 | ((null_driver_t*)self->driver)->m_is_scaling = scale; |
543 | } | 543 | } |
544 | 544 | ||
545 | 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 ) { |
546 | ((null_driver_t*)self->driver)->gui_width = width; | 546 | ((null_driver_t*)self->driver)->gui_width = width; |
547 | } | 547 | } |
548 | 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 ) { |
549 | ((null_driver_t*)self->driver)->gui_height = height; | 549 | ((null_driver_t*)self->driver)->gui_height = height; |
550 | } | 550 | } |
551 | 551 | ||
552 | 552 | ||
553 | 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 ) { |
554 | null_driver_t* this = (null_driver_t*)self->driver; | 554 | null_driver_t* this = (null_driver_t*)self->driver; |
555 | 555 | ||
556 | this->bytes_per_pixel = (depth + 7 ) / 8; | 556 | this->bytes_per_pixel = (depth + 7 ) / 8; |
557 | this->bpp = this->bytes_per_pixel * 8; | 557 | this->bpp = this->bytes_per_pixel * 8; |
558 | this->depth = depth; | 558 | this->depth = depth; |
559 | printf("depth %d %d\n", depth, this->bpp); | 559 | printf("depth %d %d\n", depth, this->bpp); |
560 | printf("pixeltype %d\n", rgb ); | 560 | printf("pixeltype %d\n", rgb ); |
561 | switch ( this->depth ) { | 561 | switch ( this->depth ) { |
562 | case 32: | 562 | case 32: |
563 | if( rgb == 0 ) | 563 | if( rgb == 0 ) |
564 | this->yuv2rgb_mode = MODE_32_RGB; | 564 | this->yuv2rgb_mode = MODE_32_RGB; |
565 | else | 565 | else |
566 | this->yuv2rgb_mode = MODE_32_BGR; | 566 | this->yuv2rgb_mode = MODE_32_BGR; |
567 | case 24: | 567 | case 24: |
568 | if( this->bpp == 32 ) { | 568 | if( this->bpp == 32 ) { |
569 | if( rgb == 0 ) { | 569 | if( rgb == 0 ) { |
570 | this->yuv2rgb_mode = MODE_32_RGB; | 570 | this->yuv2rgb_mode = MODE_32_RGB; |
571 | } else { | 571 | } else { |
572 | this->yuv2rgb_mode = MODE_32_BGR; | 572 | this->yuv2rgb_mode = MODE_32_BGR; |
573 | } | 573 | } |
574 | }else{ | 574 | }else{ |
575 | if( rgb == 0 ) | 575 | if( rgb == 0 ) |
576 | this->yuv2rgb_mode = MODE_24_RGB; | 576 | this->yuv2rgb_mode = MODE_24_RGB; |
577 | else | 577 | else |
578 | this->yuv2rgb_mode = MODE_24_BGR; | 578 | this->yuv2rgb_mode = MODE_24_BGR; |
579 | }; | 579 | }; |
580 | break; | 580 | break; |
581 | case 16: | 581 | case 16: |
582 | if( rgb == 0 ) { | 582 | if( rgb == 0 ) { |
583 | this->yuv2rgb_mode = MODE_16_RGB; | 583 | this->yuv2rgb_mode = MODE_16_RGB; |
584 | } else { | 584 | } else { |
585 | this->yuv2rgb_mode = MODE_16_BGR; | 585 | this->yuv2rgb_mode = MODE_16_BGR; |
586 | } | 586 | } |