diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-17 22:39:43 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-17 22:39:43 +0000 |
commit | 4ae9c5c307d951bf995434cfd6948c7a716516e7 (patch) | |
tree | 2f202c794043dca9ba4c4ddeae19c6adbd9c6c48 /Gui/app.c | |
parent | d97e2769db3d66f3abc3a3ecb307309161f80379 (diff) | |
download | mpv-4ae9c5c307d951bf995434cfd6948c7a716516e7.tar.bz2 mpv-4ae9c5c307d951bf995434cfd6948c7a716516e7.tar.xz |
- add playbar
- add vpotmeter
- fix gtk menu's pixel bug
- fix some critical (10l) bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8974 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/app.c')
-rw-r--r-- | Gui/app.c | 29 |
1 files changed, 24 insertions, 5 deletions
@@ -109,7 +109,6 @@ void appCopy( listItems * dest,listItems * source ) memcpy( &dest->main,&source->main,sizeof( wItem ) ); memcpy( &dest->sub,&source->sub,sizeof( wItem ) ); - memcpy( &dest->eq,&source->eq,sizeof( wItem ) ); memcpy( &dest->menuBase,&source->menuBase,sizeof( wItem ) ); memcpy( &dest->menuSelected,&source->menuSelected,sizeof( wItem ) ); } @@ -135,9 +134,9 @@ void appInitStruct( listItems * item ) item->sub.x=-1; item->sub.y=-1; appClearItem( &item->menuBase ); appClearItem( &item->menuSelected ); - item->subR=0; - item->subG=0; - item->subB=0; + item->sub.R=item->sub.G=item->sub.B=0; + item->bar.R=item->bar.G=item->bar.B=0; + item->main.R=item->main.G=item->main.B=0; item->barIsPresent=0; item->menuIsPresent=0; } @@ -161,7 +160,7 @@ int appFindMessage( unsigned char * str ) void btnModify( int event,float state ) { int j; - for ( j=0;j<appMPlayer.NumberOfItems + 1;j++ ) + for ( j=0;j < appMPlayer.NumberOfItems + 1;j++ ) if ( appMPlayer.Items[j].msg == event ) { switch ( appMPlayer.Items[j].type ) @@ -171,6 +170,7 @@ void btnModify( int event,float state ) appMPlayer.Items[j].tmp=(int)state; break; case itPotmeter: + case itVPotmeter: case itHPotmeter: if ( state < 0.0f ) state=0.0f; if ( state > 100.f ) state=100.0f; @@ -178,6 +178,25 @@ void btnModify( int event,float state ) break; } } + + for ( j=0;j < appMPlayer.NumberOfBarItems + 1;j++ ) + if ( appMPlayer.barItems[j].msg == event ) + { + switch ( appMPlayer.barItems[j].type ) + { + case itButton: + appMPlayer.barItems[j].pressed=(int)state; + appMPlayer.barItems[j].tmp=(int)state; + break; + case itPotmeter: + case itVPotmeter: + case itHPotmeter: + if ( state < 0.0f ) state=0.0f; + if ( state > 100.f ) state=100.0f; + appMPlayer.barItems[j].value=state; + break; + } + } } float btnGetValue( int event ) |