[BACK]Return to aucat.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / aucat

Diff for /src/usr.bin/aucat/aucat.c between version 1.128 and 1.129

version 1.128, 2011/12/02 12:45:29 version 1.129, 2011/12/09 14:36:42
Line 56 
Line 56 
 #define SNDIO_PRIO      (-20)  #define SNDIO_PRIO      (-20)
   
 #define PROG_AUCAT      "aucat"  #define PROG_AUCAT      "aucat"
   #define PROG_SNDIOD     "sndiod"
   
 /*  /*
  * sample rate if no ``-r'' is used   * sample rate if no ``-r'' is used
Line 83 
Line 84 
 #endif  #endif
 volatile sig_atomic_t quit_flag = 0;  volatile sig_atomic_t quit_flag = 0;
   
 char aucat_usage[] = "usage: " PROG_AUCAT " [-dlMn] [-a flag] [-b nframes] "  char aucat_usage[] = "usage: " PROG_AUCAT " [-dlMn] [-b nframes] "
     "[-C min:max] [-c min:max] [-e enc]\n\t"      "[-C min:max] [-c min:max] [-e enc]\n\t"
     "[-f device] [-h fmt] [-i file] [-j flag] [-L addr] [-m mode] "      "[-f device] [-h fmt] [-i file] [-j flag] [-m mode] [-o file]\n\t"
     "[-o file]\n\t"      "[-q port] [-r rate] [-t mode] [-v volume] [-w flag] [-x policy]\n\t"
     "[-q port] [-r rate] [-s name] [-t mode] [-U unit] [-v volume]\n\t"      "[-z nframes]\n";
     "[-w flag] [-x policy] [-z nframes]\n";  
   
   char sndiod_usage[] = "usage: " PROG_SNDIOD " [-dlM] [-a flag] [-b nframes] "
       "[-C min:max] [-c min:max] [-e enc]\n\t"
       "[-f device] [-j flag] [-L addr] [-m mode] [-q port] [-r rate]\n\t"
       "[-s name] [-t mode] [-U unit] [-v volume] [-w flag] [-x policy]\n\t"
       "[-z nframes]\n";
   
 /*  /*
  * SIGINT handler, it raises the quit flag. If the flag is already set,   * SIGINT handler, it raises the quit flag. If the flag is already set,
  * that means that the last SIGINT was not handled, because the process   * that means that the last SIGINT was not handled, because the process
Line 415 
Line 421 
         if (strcmp(prog, PROG_AUCAT) == 0) {          if (strcmp(prog, PROG_AUCAT) == 0) {
                 optstr = "a:b:c:C:de:f:h:i:j:lL:m:Mno:q:r:s:t:U:v:w:x:z:";                  optstr = "a:b:c:C:de:f:h:i:j:lL:m:Mno:q:r:s:t:U:v:w:x:z:";
                 usagestr = aucat_usage;                  usagestr = aucat_usage;
           } else if (strcmp(prog, PROG_SNDIOD) == 0) {
                   optstr = "a:b:c:C:de:f:j:L:m:Mq:r:s:t:U:v:w:x:z:";
                   usagestr = sndiod_usage;
                   background = 1;
                   hold = 0;
         } else {          } else {
                 fprintf(stderr, "%s: can't determine program to run\n", prog);                  fprintf(stderr, "%s: can't determine program to run\n", prog);
                 return 1;                  return 1;
Line 427 
Line 438 
                         if (debug_level < 4)                          if (debug_level < 4)
                                 debug_level++;                                  debug_level++;
 #endif  #endif
                           background = 0;
                         break;                          break;
                 case 'U':                  case 'U':
                         if (listen_list)                          if (listen_list)
Line 493 
Line 505 
                         dev_adjpar(d, w->mode, &w->hpar, NULL);                          dev_adjpar(d, w->mode, &w->hpar, NULL);
                         break;                          break;
                 case 's':                  case 's':
                         d = mkdev(NULL, 0, bufsz, round, 1, autovol);                          d = mkdev(DEFAULT_DEV, 0, bufsz, round, 1, autovol);
                         mkopt(optarg, d, &rpar, &ppar,                          mkopt(optarg, d, &rpar, &ppar,
                             mode, vol, mmc, join);                              mode, vol, mmc, join);
                         /* XXX: set device rate, if never set */                          /* XXX: set device rate, if never set */
Legend:
Removed from v.1.128  
changed lines
  Added in v.1.129