author | zecke <zecke> | 2004-09-23 14:49:28 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-23 14:49:28 (UTC) |
commit | 69bf1d25b253167f3d2ef4b162c42aec4d8bbf7a (patch) (unidiff) | |
tree | e410c24288b2d5093f4c7f6c880bfa832aae83eb /noncore/multimedia/opieplayer2 | |
parent | 846dc024cb41c65ddfb93af95440fcf483214b8f (diff) | |
download | opie-69bf1d25b253167f3d2ef4b162c42aec4d8bbf7a.zip opie-69bf1d25b253167f3d2ef4b162c42aec4d8bbf7a.tar.gz opie-69bf1d25b253167f3d2ef4b162c42aec4d8bbf7a.tar.bz2 |
Whitespace and indenting changes
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 90f62f2..378bbd4 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c | |||
@@ -197,13 +197,14 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ | |||
197 | 197 | ||
198 | return (vo_frame_t*) frame; | 198 | return (vo_frame_t*) frame; |
199 | } | 199 | } |
200 | 200 | ||
201 | static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | 201 | static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, |
202 | uint32_t width, uint32_t height, | 202 | uint32_t width, uint32_t height, |
203 | double ratio_code, int format, int flags ){ | 203 | double ratio_code, int format, |
204 | int flags ){ | ||
204 | null_driver_t* this = (null_driver_t*) self; | 205 | null_driver_t* this = (null_driver_t*) self; |
205 | opie_frame_t* frame = (opie_frame_t*)img; | 206 | opie_frame_t* frame = (opie_frame_t*)img; |
206 | /* not needed now */ | 207 | /* not needed now */ |
207 | 208 | ||
208 | #ifdef LOG | 209 | #ifdef LOG |
209 | fprintf (stderr, "nullvideo: update_frame_format\n"); | 210 | fprintf (stderr, "nullvideo: update_frame_format\n"); |
@@ -366,13 +367,14 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this, | |||
366 | int i; | 367 | int i; |
367 | clut_t* clut = (clut_t*) overlay->color; | 368 | clut_t* clut = (clut_t*) overlay->color; |
368 | if (!overlay->rgb_clut) { | 369 | if (!overlay->rgb_clut) { |
369 | for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) { | 370 | for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) { |
370 | *((uint32_t *)&clut[i]) = | 371 | *((uint32_t *)&clut[i]) = |
371 | frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb, | 372 | frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb, |
372 | clut[i].y, clut[i].cb, clut[i].cr); | 373 | clut[i].y, clut[i].cb, |
374 | clut[i].cr); | ||
373 | } | 375 | } |
374 | overlay->rgb_clut++; | 376 | overlay->rgb_clut++; |
375 | } | 377 | } |
376 | if (!overlay->clip_rgb_clut) { | 378 | if (!overlay->clip_rgb_clut) { |
377 | clut = (clut_t*) overlay->clip_color; | 379 | clut = (clut_t*) overlay->clip_color; |
378 | for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) { | 380 | for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) { |
@@ -381,13 +383,14 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this, | |||
381 | clut[i].y, clut[i].cb, clut[i].cr); | 383 | clut[i].y, clut[i].cb, clut[i].cr); |
382 | } | 384 | } |
383 | overlay->clip_rgb_clut++; | 385 | overlay->clip_rgb_clut++; |
384 | } | 386 | } |
385 | } | 387 | } |
386 | 388 | ||
387 | static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { | 389 | static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, |
390 | vo_overlay_t *overlay) { | ||
388 | null_driver_t *this = (null_driver_t *) this_gen; | 391 | null_driver_t *this = (null_driver_t *) this_gen; |
389 | opie_frame_t *frame = (opie_frame_t *) frame_gen; | 392 | opie_frame_t *frame = (opie_frame_t *) frame_gen; |
390 | 393 | ||
391 | if(!this->m_show_video || frame->sc.output_width == 0 | 394 | if(!this->m_show_video || frame->sc.output_width == 0 |
392 | || frame->sc.output_height== 0) | 395 | || frame->sc.output_height== 0) |
393 | return; | 396 | return; |
@@ -449,13 +452,15 @@ static void null_dispose ( vo_driver_t* self ){ | |||
449 | static int null_redraw_needed( vo_driver_t* self ){ | 452 | static int null_redraw_needed( vo_driver_t* self ){ |
450 | return 0; | 453 | return 0; |
451 | } | 454 | } |
452 | 455 | ||
453 | 456 | ||
454 | xine_vo_driver_t* init_video_out_plugin( xine_t *xine, | 457 | xine_vo_driver_t* init_video_out_plugin( xine_t *xine, |
455 | void* video, display_xine_frame_t frameDisplayFunc, void *userData ){ | 458 | void* video, |
459 | display_xine_frame_t frameDisplayFunc, | ||
460 | void *userData ){ | ||
456 | null_driver_t *vo; | 461 | null_driver_t *vo; |
457 | vo = (null_driver_t*)malloc( sizeof(null_driver_t ) ); | 462 | vo = (null_driver_t*)malloc( sizeof(null_driver_t ) ); |
458 | 463 | ||
459 | /* memset? */ | 464 | /* memset? */ |
460 | memset(vo,0, sizeof(null_driver_t ) ); | 465 | memset(vo,0, sizeof(null_driver_t ) ); |
461 | 466 | ||