[OpenNeo-CVS] openneo/apps navigate.h,1.1,1.2 navigate.c,1.1,1.2

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

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

Modified Files:
	navigate.h navigate.c 
Log Message:
Fixed do_action()

Index: navigate.h
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/navigate.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** navigate.h	26 Jun 2004 15:04:07 -0000	1.1
--- navigate.h	26 Jun 2004 15:59:25 -0000	1.2
***************
*** 45,49 ****
    the're a dead end; the user will have to go back to the previous DO/GO function
  
!   Return value:  DO Return Flags
   
    Examples of DO functions:
--- 45,49 ----
    the're a dead end; the user will have to go back to the previous DO/GO function
  
!   Return value:  Flags see flags.h
   
    Examples of DO functions:
***************
*** 57,62 ****
    THE M BUTTON / EQ BUTTON
  
!   The M button or EQ on the IR remote will ALWAYS be mapped to the GO function 
!   Root_menu no mater in which function the user is.  This is basicelly the
    Windows "Start" button. 
  
--- 57,62 ----
    THE M BUTTON / EQ BUTTON
  
!   The M button or EQ on the IR remote will ALWAYS be mapped to the state function 
!   ROOT_MENU no mater in which function the user is.  This is basicelly the
    Windows "Start" button. 
  
***************
*** 67,72 ****
  
  struct do_params {
!   int button;            //Button that trigered the call
!   int flags;             //Flags
  };
  
--- 67,72 ----
  
  struct do_params {
!   int button;            //Button that trigered the call usefull when the task needs to monitor a repeat or release
!   int flags;             //Flags that can affect how the task is done
  };
  
***************
*** 179,182 ****
  unsigned int state_get_previous(void);
  
! int do_action( int task_nb, int button );
  #endif
--- 179,182 ----
  unsigned int state_get_previous(void);
  
! int do_action( unsigned int task_nb, int button );
  #endif

Index: navigate.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/navigate.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** navigate.c	26 Jun 2004 15:04:07 -0000	1.1
--- navigate.c	26 Jun 2004 15:59:25 -0000	1.2
***************
*** 157,161 ****
  }
  
! int do_action( int task_nb, int button )
  {
    int code;
--- 157,161 ----
  }
  
! int do_action( unsigned int task_nb, int button )
  {
    int code;
***************
*** 166,173 ****
  
    //Extract flags from code
!   if( code & ACTION_VERBAL )
      params.flags |= FLAGS_VERBAL;
    
!   if( code & ACTION_VERBAL_ASK )
      params.flags |= FLAGS_VERBAL_ASK;
    
--- 166,173 ----
  
    //Extract flags from code
!   if( task_nb & ACTION_VERBAL )
      params.flags |= FLAGS_VERBAL;
    
!   if( task_nb & ACTION_VERBAL_ASK )
      params.flags |= FLAGS_VERBAL_ASK;