diff options
| author | Colin Guthrie <colin@mageia.org> | 2011-05-17 19:50:32 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-06-22 21:53:19 +0100 |
| commit | dc6c272625c7801af68126bb1983207ad88400a5 (patch) | |
| tree | d3e9e914ef1abfd6304a94f0ff94d86febd71a10 /src/modules/alsa | |
| parent | 62e43f9181da467865fe732c9b7dd52b18a4353e (diff) | |
alsa-sink: Some trivial tidyups
Mostly typo fixes but also a change to make a function relating
to sink inputs use more generic variable names.
Diffstat (limited to 'src/modules/alsa')
| -rw-r--r-- | src/modules/alsa/alsa-sink.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index b98340b7..96812c7f 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -256,6 +256,7 @@ static int reserve_monitor_init(struct userdata *u, const char *dname) { if (!(rname = pa_alsa_get_reserve_name(dname))) return 0; + /* We are resuming, try to lock the device */ u->monitor = pa_reserve_monitor_wrapper_get(u->core, rname); pa_xfree(rname); @@ -1590,7 +1591,7 @@ static void thread_func(void *userdata) { pa_usec_t volume_sleep; pa_sink_volume_change_apply(u->sink, &volume_sleep); if (volume_sleep > 0) - rtpoll_sleep = MIN(volume_sleep, rtpoll_sleep); + rtpoll_sleep = PA_MIN(volume_sleep, rtpoll_sleep); } if (rtpoll_sleep > 0) @@ -1954,7 +1955,6 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca SND_PCM_STREAM_PLAYBACK, &period_frames, &buffer_frames, tsched_frames, &b, &d, mapping))) - goto fail; } else if ((dev_id = pa_modargs_get_value(ma, "device_id", NULL))) { @@ -1969,7 +1969,6 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca SND_PCM_STREAM_PLAYBACK, &period_frames, &buffer_frames, tsched_frames, &b, &d, profile_set, &mapping))) - goto fail; } else { |