diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-27 23:11:49 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-27 23:11:49 +0000 |
commit | bb208729b33c8e8f8f00967fc722071c689dc873 (patch) | |
tree | ce85abb8004a5ace9ddd68058e5dec37118cd88f | |
parent | 92b1243b342543da0e0a9d6f2a2ec4920770976c (diff) |
10l fix in item disabling (vagymi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8301 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Gui/app.c | 2 | ||||
-rw-r--r-- | Gui/app.h | 2 | ||||
-rw-r--r-- | Gui/interface.c | 4 | ||||
-rw-r--r-- | Gui/mplayer/mw.c | 3 |
4 files changed, 5 insertions, 6 deletions
@@ -189,6 +189,6 @@ void btnSet( int event,int set ) { int j; for ( j=0;j<appMPlayer.NumberOfItems + 1;j++ ) - if ( appMPlayer.Items[j].msg == event ) appMPlayer.Items[j].disabled=set; + if ( appMPlayer.Items[j].msg == event ) appMPlayer.Items[j].pressed=set; }
\ No newline at end of file @@ -120,7 +120,7 @@ typedef struct int px,py,psx,psy; // --- int msg,msg2; - int pressed,disabled,tmp; + int pressed,tmp; int key,key2; int phases; float value; diff --git a/Gui/interface.c b/Gui/interface.c index 5bd3ec2ac3..e378981ac2 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -545,8 +545,8 @@ int guiGetEvent( int type,char * arg ) if ( guiIntfStruct.NoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); - if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM ) btnSet( evSetMoviePosition,1 ); - else btnSet( evSetMoviePosition,0 ); + if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM ) btnSet( evSetMoviePosition,btnDisabled ); + else btnSet( evSetMoviePosition,btnReleased ); if ( gtkCacheOn ) stream_cache_size=gtkCacheSize; else stream_cache_size=-1; diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index 881d145995..9d0a6fb6ae 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -179,7 +179,7 @@ void mplMainDraw( void ) { wItem * item; txSample * image = NULL; - int i; + int i, type; if ( appMPlayer.mainWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit ); @@ -196,7 +196,6 @@ void mplMainDraw( void ) for( i=0;i < appMPlayer.NumberOfItems + 1;i++ ) { item=&appMPlayer.Items[i]; - if ( !item->disabled ) switch( item->type ) { case itButton: |