Mercurial > mplayer.hg
comparison libvo/vo_macosx.m @ 21546:253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
author | nplourde |
---|---|
date | Sat, 09 Dec 2006 23:57:28 +0000 |
parents | dd05dd9e3e7b |
children | c35115c05c64 |
comparison
equal
deleted
inserted
replaced
21545:61034fd5e629 | 21546:253a1e98bfe3 |
---|---|
325 case VOCTRL_PAUSE: return (int_pause=1); | 325 case VOCTRL_PAUSE: return (int_pause=1); |
326 case VOCTRL_RESUME: return (int_pause=0); | 326 case VOCTRL_RESUME: return (int_pause=0); |
327 case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); | 327 case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); |
328 case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); [mpGLView ontop]; return VO_TRUE; | 328 case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); [mpGLView ontop]; return VO_TRUE; |
329 case VOCTRL_ROOTWIN: vo_rootwin = (!(vo_rootwin)); [mpGLView rootwin]; return VO_TRUE; | 329 case VOCTRL_ROOTWIN: vo_rootwin = (!(vo_rootwin)); [mpGLView rootwin]; return VO_TRUE; |
330 case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); [mpGLView fullscreen: YES]; return VO_TRUE; | 330 case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); [mpGLView fullscreen: NO]; return VO_TRUE; |
331 case VOCTRL_GET_PANSCAN: return VO_TRUE; | 331 case VOCTRL_GET_PANSCAN: return VO_TRUE; |
332 case VOCTRL_SET_PANSCAN: [mpGLView panscan]; return VO_TRUE; | 332 case VOCTRL_SET_PANSCAN: [mpGLView panscan]; return VO_TRUE; |
333 } | 333 } |
334 return VO_NOTIMPL; | 334 return VO_NOTIMPL; |
335 } | 335 } |
487 } | 487 } |
488 | 488 |
489 if(sender == kHalfScreenCmd) | 489 if(sender == kHalfScreenCmd) |
490 { | 490 { |
491 if(isFullscreen) { | 491 if(isFullscreen) { |
492 vo_fs = (!(vo_fs)); [self fullscreen:YES]; | 492 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
493 } | 493 } |
494 | 494 |
495 winSizeMult = 0.5; | 495 winSizeMult = 0.5; |
496 frame.size.width = (d_width*winSizeMult); | 496 frame.size.width = (d_width*winSizeMult); |
497 frame.size.height = ((d_width/movie_aspect)*winSizeMult); | 497 frame.size.height = ((d_width/movie_aspect)*winSizeMult); |
499 [self reshape]; | 499 [self reshape]; |
500 } | 500 } |
501 if(sender == kNormalScreenCmd) | 501 if(sender == kNormalScreenCmd) |
502 { | 502 { |
503 if(isFullscreen) { | 503 if(isFullscreen) { |
504 vo_fs = (!(vo_fs)); [self fullscreen:YES]; | 504 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
505 } | 505 } |
506 | 506 |
507 winSizeMult = 1; | 507 winSizeMult = 1; |
508 frame.size.width = d_width; | 508 frame.size.width = d_width; |
509 frame.size.height = d_width/movie_aspect; | 509 frame.size.height = d_width/movie_aspect; |
511 [self reshape]; | 511 [self reshape]; |
512 } | 512 } |
513 if(sender == kDoubleScreenCmd) | 513 if(sender == kDoubleScreenCmd) |
514 { | 514 { |
515 if(isFullscreen) { | 515 if(isFullscreen) { |
516 vo_fs = (!(vo_fs)); [self fullscreen:YES]; | 516 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
517 } | 517 } |
518 | 518 |
519 winSizeMult = 2; | 519 winSizeMult = 2; |
520 frame.size.width = d_width*winSizeMult; | 520 frame.size.width = d_width*winSizeMult; |
521 frame.size.height = (d_width/movie_aspect)*winSizeMult; | 521 frame.size.height = (d_width/movie_aspect)*winSizeMult; |
523 [self reshape]; | 523 [self reshape]; |
524 } | 524 } |
525 if(sender == kFullScreenCmd) | 525 if(sender == kFullScreenCmd) |
526 { | 526 { |
527 vo_fs = (!(vo_fs)); | 527 vo_fs = (!(vo_fs)); |
528 [self fullscreen:YES]; | 528 [self fullscreen:NO]; |
529 } | 529 } |
530 | 530 |
531 if(sender == kKeepAspectCmd) | 531 if(sender == kKeepAspectCmd) |
532 { | 532 { |
533 vo_keepaspect = (!(vo_keepaspect)); | 533 vo_keepaspect = (!(vo_keepaspect)); |