[OpenNeo-CVS] openneo/apps softkeys.c,1.13,1.14

[Francois B <mrs...@us...>]

Update of /cvsroot/openneo/openneo/apps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24241

Modified Files:
	softkeys.c 
Log Message:
Code cleanup

Index: softkeys.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/softkeys.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** softkeys.c	28 Apr 2006 01:03:49 -0000	1.13
--- softkeys.c	12 Jun 2006 01:13:40 -0000	1.14
***************
*** 142,145 ****
--- 142,147 ----
  unsigned int softkeys_get( int section, int button )
  {
+     unsigned int ret = 0;
+ 
    //Remove the flag part
    button &= BUTTON_MASK;
***************
*** 147,180 ****
    switch( button ){
    case BUTTON_PLAY:
!     return current_softkeys[section][KEY_PLAY];
    case BUTTON_STOP:
!     return current_softkeys[section][KEY_STOP];
    case BUTTON_PROGRAM:
!     return current_softkeys[section][KEY_P];
    case BUTTON_SELECT:
!     return current_softkeys[section][KEY_S];
    case BUTTON_MENU:
!     return current_softkeys[section][KEY_M];
    case BUTTON_LEFT:
!     return current_softkeys[section][KEY_LEFT];
    case BUTTON_RIGHT:
!     return current_softkeys[section][KEY_RIGHT];
    case BUTTON_UP:
!     return current_softkeys[section][KEY_UP];
    case BUTTON_DOWN:
!     return current_softkeys[section][KEY_DOWN];
    case BUTTON_IR_POWER:
!     return current_softkeys[section][KEY_IR_POWER];
    case BUTTON_IR_SETTING:
!     return current_softkeys[section][KEY_IR_SETTING];
    case BUTTON_IR_BROWSE:
!     return current_softkeys[section][KEY_IR_BROWSE];
    case BUTTON_IR_EQ:
!     return current_softkeys[section][KEY_IR_EQ];
    case BUTTON_IR_MUTE:
!     return current_softkeys[section][KEY_IR_MUTE];
    }
  
!   return 0;
  }
  
--- 149,199 ----
    switch( button ){
    case BUTTON_PLAY:
!     ret = current_softkeys[section][KEY_PLAY];
!     break;
    case BUTTON_STOP:
!     ret = current_softkeys[section][KEY_STOP];
!     break;
    case BUTTON_PROGRAM:
!     ret = current_softkeys[section][KEY_P];
!     break;
    case BUTTON_SELECT:
!     ret = current_softkeys[section][KEY_S];
!     break;
    case BUTTON_MENU:
!     ret = current_softkeys[section][KEY_M];
!     break;
    case BUTTON_LEFT:
!     ret = current_softkeys[section][KEY_LEFT];
!     break;
    case BUTTON_RIGHT:
!     ret = current_softkeys[section][KEY_RIGHT];
!     break;
    case BUTTON_UP:
!     ret = current_softkeys[section][KEY_UP];
!     break;
    case BUTTON_DOWN:
!     ret = current_softkeys[section][KEY_DOWN];
!     break;
    case BUTTON_IR_POWER:
!     ret = current_softkeys[section][KEY_IR_POWER];
!     break;
    case BUTTON_IR_SETTING:
!     ret = current_softkeys[section][KEY_IR_SETTING];
!     break;
    case BUTTON_IR_BROWSE:
!     ret = current_softkeys[section][KEY_IR_BROWSE];
!     break;
    case BUTTON_IR_EQ:
!     ret = current_softkeys[section][KEY_IR_EQ];
!     break;
    case BUTTON_IR_MUTE:
!     ret = current_softkeys[section][KEY_IR_MUTE];
!     break;
    }
  
!   if( ret == RESERVED_SOFTKEY )
!       ret = NAV_INVALID_CODE;
! 
!   return ret;
  }
  
***************
*** 221,225 ****
  {
      unsigned short code = 0;
!     int len, val;
      
      if( buffer[0] == 'p' || buffer[0] == 'P' )
--- 240,244 ----
  {
      unsigned short code = 0;
!     int val;
      
      if( buffer[0] == 'p' || buffer[0] == 'P' )
***************
*** 409,413 ****
      unsigned short code = dualcode & 0xffff;
  
!     *flags = 0;
  
      if( code == NAV_INVALID_CODE )
--- 428,432 ----
      unsigned short code = dualcode & 0xffff;
  
!     (*flags) = 0;
  
      if( code == NAV_INVALID_CODE )
***************
*** 415,419 ****
  	
      if( IS_ACTION(code) )
! 	*flags |= do_action( code, button );
      else
  	return code; // return state
--- 434,438 ----
  	
      if( IS_ACTION(code) )
! 	(*flags) = do_action( code, button );
      else
  	return code; // return state
***************
*** 427,431 ****
      
      if( IS_ACTION(code) ) {
! 	*flags |= do_action( code, button );
  	return NAV_INVALID_CODE;
      }
--- 446,450 ----
      
      if( IS_ACTION(code) ) {
! 	(*flags) |= do_action( code, button );
  	return NAV_INVALID_CODE;
      }