| audio.c (302408) | audio.c (309007) |
|---|---|
| 1/* 2 * audio.c - audio interface for reference clock audio drivers 3 */ 4#ifdef HAVE_CONFIG_H 5# include <config.h> 6#endif 7 8#if defined(HAVE_SYS_AUDIOIO_H) || defined(HAVE_SUN_AUDIOIO_H) || \ --- 41 unchanged lines hidden (view full) --- 50 * Global variables 51 */ 52#ifdef HAVE_SYS_AUDIOIO_H 53static struct audio_device device; /* audio device ident */ 54#endif /* HAVE_SYS_AUDIOIO_H */ 55#ifdef PCM_STYLE_SOUND 56# define INIT_FILE "/etc/ntp.audio" 57int agc = SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */ | 1/* 2 * audio.c - audio interface for reference clock audio drivers 3 */ 4#ifdef HAVE_CONFIG_H 5# include <config.h> 6#endif 7 8#if defined(HAVE_SYS_AUDIOIO_H) || defined(HAVE_SUN_AUDIOIO_H) || \ --- 41 unchanged lines hidden (view full) --- 50 * Global variables 51 */ 52#ifdef HAVE_SYS_AUDIOIO_H 53static struct audio_device device; /* audio device ident */ 54#endif /* HAVE_SYS_AUDIOIO_H */ 55#ifdef PCM_STYLE_SOUND 56# define INIT_FILE "/etc/ntp.audio" 57int agc = SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */ |
| 58int monitor = SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */ | 58int audiomonitor = SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */ |
| 59int devmask = 0; 60int recmask = 0; 61char cf_c_dev[100], cf_i_dev[100], cf_agc[100], cf_monitor[100]; 62 63const char *m_names[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_NAMES; 64#else /* not PCM_STYLE_SOUND */ 65static struct audio_info info; /* audio device info */ 66#endif /* not PCM_STYLE_SOUND */ --- 262 unchanged lines hidden (view full) --- 329 } 330 331 if (cf_monitor[0] != '\0') { 332 int i; 333 334 /* devmask */ 335 i = mixer_name(cf_monitor, devmask); 336 if (i >= 0) | 59int devmask = 0; 60int recmask = 0; 61char cf_c_dev[100], cf_i_dev[100], cf_agc[100], cf_monitor[100]; 62 63const char *m_names[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_NAMES; 64#else /* not PCM_STYLE_SOUND */ 65static struct audio_info info; /* audio device info */ 66#endif /* not PCM_STYLE_SOUND */ --- 262 unchanged lines hidden (view full) --- 329 } 330 331 if (cf_monitor[0] != '\0') { 332 int i; 333 334 /* devmask */ 335 i = mixer_name(cf_monitor, devmask); 336 if (i >= 0) |
| 337 monitor = MIXER_WRITE(i); | 337 audiomonitor = MIXER_WRITE(i); |
| 338 else 339 printf("monitor %s not in devmask %#x\n", 340 cf_monitor, devmask); 341 } 342 343#else /* not PCM_STYLE_SOUND */ 344 AUDIO_INITINFO(&info); 345 info.play.gain = AUDIO_MAX_GAIN; --- 61 unchanged lines hidden (view full) --- 407 if (o_mongain != mongain) { 408 r = l = 100 * mongain / 255; /* Normalize to 0-100 */ 409# ifdef DEBUG 410 if (debug > 1) 411 printf("audio_gain: mongain %d/%d\n", mongain, l); 412# endif 413 l |= r << 8; 414 if (cf_monitor[0] != '\0') | 338 else 339 printf("monitor %s not in devmask %#x\n", 340 cf_monitor, devmask); 341 } 342 343#else /* not PCM_STYLE_SOUND */ 344 AUDIO_INITINFO(&info); 345 info.play.gain = AUDIO_MAX_GAIN; --- 61 unchanged lines hidden (view full) --- 407 if (o_mongain != mongain) { 408 r = l = 100 * mongain / 255; /* Normalize to 0-100 */ 409# ifdef DEBUG 410 if (debug > 1) 411 printf("audio_gain: mongain %d/%d\n", mongain, l); 412# endif 413 l |= r << 8; 414 if (cf_monitor[0] != '\0') |
| 415 rval = ioctl(ctl_fd, monitor, &l ); | 415 rval = ioctl(ctl_fd, audiomonitor, &l ); |
| 416 else 417 rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_VOLUME, 418 &l); 419 if (-1 == rval) { 420 printf("audio_gain: mongain write: %s\n", 421 strerror(errno)); 422 return (rval); 423 } --- 84 unchanged lines hidden --- | 416 else 417 rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_VOLUME, 418 &l); 419 if (-1 == rval) { 420 printf("audio_gain: mongain write: %s\n", 421 strerror(errno)); 422 return (rval); 423 } --- 84 unchanged lines hidden --- |