diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/alsa-util.c | 2 | ||||
| -rw-r--r-- | src/modules/module-detect.c | 6 | ||||
| -rw-r--r-- | src/modules/oss-util.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/alsa-util.c b/src/modules/alsa-util.c index 40be5311..0a518025 100644 --- a/src/modules/alsa-util.c +++ b/src/modules/alsa-util.c @@ -326,7 +326,7 @@ int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint32_t *p if ((ret = snd_pcm_hw_params_malloc(&hwparams)) < 0 || (ret = snd_pcm_hw_params_any(pcm_handle, hwparams)) < 0 || (ret = snd_pcm_hw_params_set_rate_resample(pcm_handle, hwparams, 0)) < 0 || - (ret = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) + (ret = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) goto finish; if ((ret = set_format(pcm_handle, hwparams, &f)) < 0) diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c index 41b68ac3..29d6fc27 100644 --- a/src/modules/module-detect.c +++ b/src/modules/module-detect.c @@ -139,7 +139,7 @@ static int detect_oss(pa_core *c, int just_one) { line[strcspn(line, "\r\n")] = 0; if (!b) { - b = strcmp(line, "Audio devices:") == 0 || strcmp(line, "Installed devices:") == 0; + b = strcmp(line, "Audio devices:") == 0 || strcmp(line, "Installed devices:") == 0; continue; } @@ -155,13 +155,13 @@ static int detect_oss(pa_core *c, int just_one) { if (!pa_module_load(c, "module-oss", args)) continue; - } else if (sscanf(line, "pcm%u: ", &device) == 1) { + } else if (sscanf(line, "pcm%u: ", &device) == 1) { /* FreeBSD support, the devices are named /dev/dsp0.0, dsp0.1 and so on */ snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device); if (!pa_module_load(c, "module-oss", args)) continue; - } + } n++; diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c index fb531468..4be71e2c 100644 --- a/src/modules/oss-util.c +++ b/src/modules/oss-util.c @@ -99,7 +99,7 @@ success: #ifdef DSP_CAP_BIND *pcaps & DSP_CAP_BIND ? " BIND" : "", #else - "", + "", #endif *pcaps & DSP_CAP_COPROC ? " COPROC" : "", *pcaps & DSP_CAP_DUPLEX ? " DUPLEX" : "", @@ -122,7 +122,7 @@ success: #ifdef DSP_CAP_MULTI *pcaps & DSP_CAP_MULTI ? " MULTI" : "", #else - "", + "", #endif #ifdef DSP_CAP_OUTPUT *pcaps & DSP_CAP_OUTPUT ? " OUTPUT" : "", |