[OpenNeo-CVS] openneo/apps wps-display.c,1.18,1.19

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

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

Modified Files:
	wps-display.c 
Log Message:
Updated mute display to use function from driver + language file

Index: wps-display.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/wps-display.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wps-display.c	24 May 2004 00:39:27 -0000	1.18
--- wps-display.c	26 Jun 2004 14:57:11 -0000	1.19
***************
*** 48,52 ****
  #include "kernel.h"
  #include "system.h"
- #include "status.h"
  #include "wps-display.h"
  #include "debug.h"
--- 48,51 ----
***************
*** 71,77 ****
                                  (1/HZ sec, or 100ths of a sec) */
  #define SUBLINE_RESET -1
!                                              
! extern bool muted;
! 
  //static unsigned char wps_progress_pat[8]={0,0,0,0,0,0,0,0};
  static bool full_line_progressbar=0;
--- 70,74 ----
                                  (1/HZ sec, or 100ths of a sec) */
  #define SUBLINE_RESET -1
!                                             
  //static unsigned char wps_progress_pat[8]={0,0,0,0,0,0,0,0};
  static bool full_line_progressbar=0;
***************
*** 406,410 ****
                      return buf;
                  case 'm':  /* mute */
!                     if (muted) {
                          snprintf(buf,buf_size,"Mute");
                          return buf;
--- 403,407 ----
                      return buf;
                  case 'm':  /* mute */
! 		  if (audio_is_muted()) {
                          snprintf(buf,buf_size,"Mute");
                          return buf;
***************
*** 452,456 ****
                      switch (global_settings.repeat_mode) {
                          case REPEAT_OFF:
! 			  return str(LANG_OFF);
                              break;
                          case REPEAT_ALL:
--- 449,453 ----
                      switch (global_settings.repeat_mode) {
                          case REPEAT_OFF:
! 			  return "";
                              break;
                          case REPEAT_ALL: