Mercurial > mplayer.hg
comparison Gui/mplayer/mw.h @ 1848:8ce1c088d05d
fix osd volume bar handling in gui
author | pontscho |
---|---|
date | Sun, 02 Sep 2001 21:49:21 +0000 |
parents | 773ae4ba43f5 |
children | c65abbc91c5c |
comparison
equal
deleted
inserted
replaced
1847:773ae4ba43f5 | 1848:8ce1c088d05d |
---|---|
433 item->pressed=btnPressed; | 433 item->pressed=btnPressed; |
434 item->used=1; | 434 item->used=1; |
435 mplMainRender=1; | 435 mplMainRender=1; |
436 SelectedButton=i; | 436 SelectedButton=i; |
437 boxMoved=0; | 437 boxMoved=0; |
438 if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) mplShMem->VolumeChanged=1; | |
439 msButton=itPotmeter; | 438 msButton=itPotmeter; |
440 itemtype=itPotmeter; | 439 itemtype=itPotmeter; |
441 } | 440 } |
442 break; | 441 break; |
443 case itHPotmeter: | 442 case itHPotmeter: |
448 item->pressed=btnPressed; | 447 item->pressed=btnPressed; |
449 item->used=1; | 448 item->used=1; |
450 mplMainRender=1; | 449 mplMainRender=1; |
451 SelectedButton=i; | 450 SelectedButton=i; |
452 boxMoved=0; | 451 boxMoved=0; |
453 if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) mplShMem->VolumeChanged=1; | |
454 msButton=itHPotmeter; | 452 msButton=itHPotmeter; |
455 itemtype=itHPotmeter; | 453 itemtype=itHPotmeter; |
456 } | 454 } |
457 break; | 455 break; |
458 } | 456 } |
476 case itHPotmeter: | 474 case itHPotmeter: |
477 item->value=(float)( X - item->x ) / item->width * 100.0f; | 475 item->value=(float)( X - item->x ) / item->width * 100.0f; |
478 potihandled: | 476 potihandled: |
479 if ( item->value > 100.0f ) item->value=100.0f; | 477 if ( item->value > 100.0f ) item->value=100.0f; |
480 if ( item->value < 0.0f ) item->value=0.0f; | 478 if ( item->value < 0.0f ) item->value=0.0f; |
481 // if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) | 479 if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) |
480 { | |
481 mplShMem->VolumeChanged=1; | |
482 mplShMem->Volume=item->value; | |
483 } | |
482 mplMsgHandle( item->msg,item->value ); | 484 mplMsgHandle( item->msg,item->value ); |
483 mplMainRender=1; wsPostRedisplay( &appMPlayer.mainWindow ); | 485 mplMainRender=1; wsPostRedisplay( &appMPlayer.mainWindow ); |
484 break; | 486 break; |
485 } | 487 } |
486 break; | 488 break; |
498 break; | 500 break; |
499 case itPotmeter: | 501 case itPotmeter: |
500 case itHPotmeter: | 502 case itHPotmeter: |
501 item->used=0; | 503 item->used=0; |
502 btnModify( item->msg,(float)( X - item->x ) / item->width * 100.0f ); | 504 btnModify( item->msg,(float)( X - item->x ) / item->width * 100.0f ); |
505 if ( ( item->msg == evSetVolume )||( item->msg == evSetBalance ) ) | |
506 { | |
507 mplShMem->VolumeChanged=1; | |
508 mplShMem->Volume=item->value; | |
509 } | |
503 value=item->value; | 510 value=item->value; |
504 break; | 511 break; |
505 } | 512 } |
506 if ( SelectedButton != -1 ) mplMsgHandle( item->msg,value ); | 513 if ( SelectedButton != -1 ) mplMsgHandle( item->msg,value ); |
507 SelectedButton=-1; | 514 SelectedButton=-1; |