From 60d015f04980aafcfbbb2f4a436c848ea0c1d0fa Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sun, 12 Jun 2016 12:55:11 +0200 Subject: pulse: rename error to pa_error --- modules/pulse/player.c | 6 +++--- modules/pulse/recorder.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'modules') diff --git a/modules/pulse/player.c b/modules/pulse/player.c index 12cf559..d84b0e5 100644 --- a/modules/pulse/player.c +++ b/modules/pulse/player.c @@ -47,16 +47,16 @@ static void *write_thread(void *arg) { struct auplay_st *st = arg; const size_t num_bytes = st->sampc * 2; - int ret, error = 0; + int ret, pa_error = 0; while (st->run) { st->wh(st->sampv, st->sampc, st->arg); - ret = pa_simple_write(st->s, st->sampv, num_bytes, &error); + ret = pa_simple_write(st->s, st->sampv, num_bytes, &pa_error); if (ret < 0) { warning("pulse: pa_simple_write error (%s)\n", - pa_strerror(error)); + pa_strerror(pa_error)); } } diff --git a/modules/pulse/recorder.c b/modules/pulse/recorder.c index 4ac27b7..78c622d 100644 --- a/modules/pulse/recorder.c +++ b/modules/pulse/recorder.c @@ -47,14 +47,14 @@ static void *read_thread(void *arg) { struct ausrc_st *st = arg; const size_t num_bytes = st->sampc * 2; - int ret, error = 0; + int ret, pa_error = 0; while (st->run) { - ret = pa_simple_read(st->s, st->sampv, num_bytes, &error); + ret = pa_simple_read(st->s, st->sampv, num_bytes, &pa_error); if (ret < 0) { warning("pulse: pa_simple_write error (%s)\n", - pa_strerror(error)); + pa_strerror(pa_error)); continue; } -- cgit v1.2.3