Changeset 46c62accfc36a9e7e8ab4d47984a02374102e416
- Timestamp:
- 06/06/07 11:33:44
(1 year ago)
- Author:
- Jean-Paul Saman <jpsaman@videolan.org>
- git-committer:
- Jean-Paul Saman <jpsaman@videolan.org> 1181122424 +0000
- git-parent:
[499b9cfb254c8a4000efd402019dc4ae495c6286]
- git-author:
- Jean-Paul Saman <jpsaman@videolan.org> 1181122424 +0000
- Message:
Remove excess whitespace
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r499b9cf |
r46c62ac |
|
| 296 | 296 | * Is there a menu item above or below? If so, then select it. |
|---|
| 297 | 297 | */ |
|---|
| 298 | | if( p_button && p_button->p_up) |
|---|
| | 298 | if( p_button && p_button->p_up ) |
|---|
| 299 | 299 | { |
|---|
| 300 | 300 | vlc_object_release( (vlc_object_t*) p_osd ); |
|---|
| … | … | |
| 303 | 303 | return; |
|---|
| 304 | 304 | } |
|---|
| 305 | | if( p_button && p_button->p_down) |
|---|
| | 305 | if( p_button && p_button->p_down ) |
|---|
| 306 | 306 | { |
|---|
| 307 | 307 | vlc_object_release( (vlc_object_t*) p_osd ); |
|---|
| … | … | |
| 362 | 362 | p_osd->p_state->p_visible = p_osd->p_button; |
|---|
| 363 | 363 | |
|---|
| 364 | | if( !p_osd->p_state->p_visible->b_range ) |
|---|
| | 364 | if( !p_osd->p_state->p_visible->b_range ) |
|---|
| 365 | 365 | p_osd->p_state->p_visible->p_current_state = |
|---|
| 366 | 366 | osd_StateChange( p_osd->p_state->p_visible->p_states, OSD_BUTTON_SELECT ); |
|---|
| 367 | 367 | |
|---|
| 368 | | osd_UpdateState( p_osd->p_state, |
|---|
| | 368 | osd_UpdateState( p_osd->p_state, |
|---|
| 369 | 369 | p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y, |
|---|
| 370 | 370 | p_osd->p_state->p_visible->p_current_state->p_pic->p[Y_PLANE].i_visible_pitch, |
|---|
| … | … | |
| 406 | 406 | if( p_button ) |
|---|
| 407 | 407 | { |
|---|
| 408 | | if( !p_button->b_range ) |
|---|
| | 408 | if( !p_button->b_range ) |
|---|
| 409 | 409 | p_button->p_current_state = osd_StateChange( p_button->p_states, OSD_BUTTON_UNSELECT ); |
|---|
| 410 | 410 | if( p_button->p_prev ) |
|---|
| … | … | |
| 413 | 413 | p_osd->p_state->p_visible = p_osd->p_last_button; |
|---|
| 414 | 414 | |
|---|
| 415 | | if( !p_osd->p_state->p_visible->b_range ) |
|---|
| | 415 | if( !p_osd->p_state->p_visible->b_range ) |
|---|
| 416 | 416 | p_osd->p_state->p_visible->p_current_state = |
|---|
| 417 | 417 | osd_StateChange( p_osd->p_state->p_visible->p_states, OSD_BUTTON_SELECT ); |
|---|
| 418 | 418 | |
|---|
| 419 | | osd_UpdateState( p_osd->p_state, |
|---|
| | 419 | osd_UpdateState( p_osd->p_state, |
|---|
| 420 | 420 | p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y, |
|---|
| 421 | 421 | p_osd->p_state->p_visible->p_current_state->p_pic->p[Y_PLANE].i_visible_pitch, |
|---|
| … | … | |
| 459 | 459 | if( p_button ) |
|---|
| 460 | 460 | { |
|---|
| 461 | | if( !p_button->b_range ) |
|---|
| | 461 | if( !p_button->b_range ) |
|---|
| 462 | 462 | { |
|---|
| 463 | 463 | p_button->p_current_state = osd_StateChange( p_button->p_states, OSD_BUTTON_SELECT ); |
|---|
| … | … | |
| 466 | 466 | } |
|---|
| 467 | 467 | |
|---|
| 468 | | if( p_button->b_range && p_osd->p_state->p_visible->b_range ) |
|---|
| | 468 | if( p_button->b_range && p_osd->p_state->p_visible->b_range ) |
|---|
| 469 | 469 | { |
|---|
| 470 | 470 | osd_state_t *p_temp = p_osd->p_state->p_visible->p_current_state; |
|---|
| … | … | |
| 478 | 478 | } |
|---|
| 479 | 479 | |
|---|
| 480 | | osd_UpdateState( p_osd->p_state, |
|---|
| | 480 | osd_UpdateState( p_osd->p_state, |
|---|
| 481 | 481 | p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y, |
|---|
| 482 | 482 | p_osd->p_state->p_visible->p_current_state->p_pic->p[Y_PLANE].i_visible_pitch, |
|---|
| … | … | |
| 487 | 487 | * then perform "menu select" on every menu navigation |
|---|
| 488 | 488 | */ |
|---|
| 489 | | if( p_button->b_range ) |
|---|
| | 489 | if( p_button->b_range ) |
|---|
| 490 | 490 | { |
|---|
| 491 | 491 | osd_SetKeyPressed( VLC_OBJECT(p_osd->p_libvlc), config_GetInt(p_osd, p_button->psz_action) ); |
|---|
| … | … | |
| 531 | 531 | if( p_button ) |
|---|
| 532 | 532 | { |
|---|
| 533 | | if( !p_button->b_range ) |
|---|
| | 533 | if( !p_button->b_range ) |
|---|
| 534 | 534 | { |
|---|
| 535 | 535 | p_button->p_current_state = osd_StateChange( p_button->p_states, OSD_BUTTON_SELECT ); |
|---|
| … | … | |
| 538 | 538 | } |
|---|
| 539 | 539 | |
|---|
| 540 | | if( p_button->b_range && p_osd->p_state->p_visible->b_range ) |
|---|
| | 540 | if( p_button->b_range && p_osd->p_state->p_visible->b_range ) |
|---|
| 541 | 541 | { |
|---|
| 542 | 542 | osd_state_t *p_temp = p_osd->p_state->p_visible->p_current_state; |
|---|
| … | … | |
| 550 | 550 | } |
|---|
| 551 | 551 | |
|---|
| 552 | | osd_UpdateState( p_osd->p_state, |
|---|
| | 552 | osd_UpdateState( p_osd->p_state, |
|---|
| 553 | 553 | p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y, |
|---|
| 554 | 554 | p_osd->p_state->p_visible->p_current_state->p_pic->p[Y_PLANE].i_visible_pitch, |
|---|
| … | … | |
| 559 | 559 | * then perform "menu select" on every menu navigation |
|---|
| 560 | 560 | */ |
|---|
| 561 | | if( p_button->b_range ) |
|---|
| | 561 | if( p_button->b_range ) |
|---|
| 562 | 562 | { |
|---|
| 563 | 563 | osd_SetKeyPressed( VLC_OBJECT(p_osd->p_libvlc), config_GetInt(p_osd, p_button->psz_action_down) ); |
|---|
| … | … | |
| 611 | 611 | |
|---|
| 612 | 612 | p_button = p_osd->p_state->p_volume; |
|---|
| 613 | | if( p_osd->p_state->p_volume ) |
|---|
| | 613 | if( p_osd->p_state->p_volume ) |
|---|
| 614 | 614 | p_osd->p_state->p_visible = p_osd->p_state->p_volume; |
|---|
| 615 | 615 | if( p_button && p_button->b_range ) |
|---|