← Back to branch summary

~ubuntu-branches/debian/sid/ntp/sid

« back to all changes in this revision

Viewing changes to libntp/audio.c

  • Committer: Package Import Robot
  • Author(s): Peter Eisentraut
  • Date: 2012-02-27 13:55:56 UTC
  • mfrom: (1.2.12)
  • Revision ID: package-import@ubuntu.com-20120227135556-dkx4mkod5trl5bgt
Tags: 1:4.2.6.p5+dfsg-1
http://bugs.debian.org/644673
* New upstream release (closes: #644673)
* Updated instructions on generating autotools.patch
* Updated standards version

Show diffs side-by-side

added added

removed removed

Lines of Context:
libntp/audio.c
174
174
                for (; *ca && isascii((int)*ca) && (isspace((int)*ca) || (*ca == '=')); ca++)
175
175
                        continue;
176
176
 
177
 
                if (!strncmp(cc, "IDEV", (size_t) 4)) {
178
 
                        sscanf(ca, "%s", ab);
179
 
                        strcpy(cf_i_dev, ab);
 
177
                if (!strncmp(cc, "IDEV", 4) &&
 
178
                    1 == sscanf(ca, "%99s", ab)) {
 
179
                        strncpy(cf_i_dev, ab, sizeof(cf_i_dev));
180
180
                        printf("idev <%s>\n", ab);
181
 
                } else if (!strncmp(cc, "CDEV", (size_t) 4)) {
182
 
                        sscanf(ca, "%s", ab);
183
 
                        strcpy(cf_c_dev, ab);
 
181
                } else if (!strncmp(cc, "CDEV", 4) &&
 
182
                           1 == sscanf(ca, "%99s", ab)) {
 
183
                        strncpy(cf_c_dev, ab, sizeof(cf_c_dev));
184
184
                        printf("cdev <%s>\n", ab);
185
 
                } else if (!strncmp(cc, "AGC", (size_t) 3)) {
186
 
                        sscanf(ca, "%s", ab);
187
 
                        strcpy(cf_agc, ab);
 
185
                } else if (!strncmp(cc, "AGC", 3) &&
 
186
                           1 == sscanf(ca, "%99s", ab)) {
 
187
                        strncpy(cf_agc, ab, sizeof(cf_agc));
188
188
                        printf("agc <%s> %d\n", ab, i);
189
 
                } else if (!strncmp(cc, "MONITOR", (size_t) 7)) {
190
 
                        sscanf(ca, "%s", ab);
191
 
                        strcpy(cf_monitor, ab);
 
189
                } else if (!strncmp(cc, "MONITOR", 7) &&
 
190
                           1 == sscanf(ca, "%99s", ab)) {
 
191
                        strncpy(cf_monitor, ab, sizeof(cf_monitor));
192
192
                        printf("monitor <%s> %d\n", ab, mixer_name(ab, -1));
193
193
                }
194
194
        }
316
316
            printf("SOUND_MIXER_READ_RECMASK: %s\n", strerror(errno));
317
317
 
318
318
        /* validate and set any specified config file stuff */
319
 
        if (*cf_agc) {
 
319
        if (cf_agc[0] != '\0') {
320
320
                int i;
321
321
 
322
322
                i = mixer_name(cf_agc, devmask);
327
327
                               cf_agc, recmask);
328
328
        }
329
329
 
330
 
        if (*cf_monitor) {
 
330
        if (cf_monitor[0] != '\0') {
331
331
                int i;
332
332
 
333
333
                /* devmask */
388
388
        r = 0 ; /* setting to zero nicely mutes the channel */
389
389
#endif
390
390
        l |= r << 8;
391
 
        if ( cf_agc )
392
 
          rval = ioctl(ctl_fd, agc, &l);
393
 
        else
394
 
          if (port == 2) {
395
 
            rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_LINE, &l);
396
 
          } else {
397
 
            rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_MIC, &l);
398
 
          }
399
 
        if (rval == -1) {
 
391
        if (cf_agc[0] != '\0')
 
392
                rval = ioctl(ctl_fd, agc, &l);
 
393
        else
 
394
                if (2 == port)
 
395
                        rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_LINE, &l);
 
396
                else
 
397
                        rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_MIC, &l);
 
398
        if (-1 == rval) {
400
399
                printf("audio_gain: agc write: %s\n", strerror(errno));
401
 
                return (rval);
 
400
                return rval;
402
401
        }
403
402
 
404
403
        if (o_mongain != mongain) {
408
407
                        printf("audio_gain: mongain %d/%d\n", mongain, l);
409
408
# endif
410
409
                l |= r << 8;
411
 
                if ( cf_monitor )
412
 
                  rval = ioctl(ctl_fd, monitor, &l );
413
 
                else 
414
 
                  rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_VOLUME, &l);
415
 
                if (rval == -1) {
 
410
                if (cf_monitor[0] != '\0')
 
411
                        rval = ioctl(ctl_fd, monitor, &l );
 
412
                else 
 
413
                        rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_VOLUME,
 
414
                                     &l);
 
415
                if (-1 == rval) {
416
416
                        printf("audio_gain: mongain write: %s\n",
417
417
                               strerror(errno));
418
418
                        return (rval);