From a65a20d274a3e2de281e446a3c1134b798774f9c Mon Sep 17 00:00:00 2001 From: Kamal Mostafa Date: Sun, 12 Aug 2012 14:39:23 -0700 Subject: [PATCH] simpleaudio: generalize r/w buf pointer types --- src/simpleaudio-alsa.c | 4 ++-- src/simpleaudio-pulse.c | 4 ++-- src/simpleaudio-sndfile.c | 4 ++-- src/simpleaudio.c | 4 ++-- src/simpleaudio.h | 4 ++-- src/simpleaudio_internal.h | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/simpleaudio-alsa.c b/src/simpleaudio-alsa.c index 68610d1..af58b6c 100644 --- a/src/simpleaudio-alsa.c +++ b/src/simpleaudio-alsa.c @@ -39,7 +39,7 @@ static ssize_t -sa_alsa_read( simpleaudio *sa, float *buf, size_t nframes ) +sa_alsa_read( simpleaudio *sa, void *buf, size_t nframes ) { ssize_t frames_read = 0; snd_pcm_t *pcm = (snd_pcm_t *)sa->backend_handle; @@ -65,7 +65,7 @@ sa_alsa_read( simpleaudio *sa, float *buf, size_t nframes ) static ssize_t -sa_alsa_write( simpleaudio *sa, float *buf, size_t nframes ) +sa_alsa_write( simpleaudio *sa, void *buf, size_t nframes ) { ssize_t frames_written = 0; snd_pcm_t *pcm = (snd_pcm_t *)sa->backend_handle; diff --git a/src/simpleaudio-pulse.c b/src/simpleaudio-pulse.c index 1a84204..b7e9d3b 100644 --- a/src/simpleaudio-pulse.c +++ b/src/simpleaudio-pulse.c @@ -41,7 +41,7 @@ static ssize_t -sa_pulse_read( simpleaudio *sa, float *buf, size_t nframes ) +sa_pulse_read( simpleaudio *sa, void *buf, size_t nframes ) { int error; pa_simple *s = (pa_simple *)sa->backend_handle; @@ -57,7 +57,7 @@ sa_pulse_read( simpleaudio *sa, float *buf, size_t nframes ) static ssize_t -sa_pulse_write( simpleaudio *sa, float *buf, size_t nframes ) +sa_pulse_write( simpleaudio *sa, void *buf, size_t nframes ) { int error; pa_simple *s = (pa_simple *)sa->backend_handle; diff --git a/src/simpleaudio-sndfile.c b/src/simpleaudio-sndfile.c index 0a4c77b..0356c9b 100644 --- a/src/simpleaudio-sndfile.c +++ b/src/simpleaudio-sndfile.c @@ -40,7 +40,7 @@ static ssize_t -sa_sndfile_read( simpleaudio *sa, float *buf, size_t nframes ) +sa_sndfile_read( simpleaudio *sa, void *buf, size_t nframes ) { SNDFILE *s = (SNDFILE *)sa->backend_handle; int n; @@ -55,7 +55,7 @@ sa_sndfile_read( simpleaudio *sa, float *buf, size_t nframes ) static ssize_t -sa_sndfile_write( simpleaudio *sa, float *buf, size_t nframes ) +sa_sndfile_write( simpleaudio *sa, void *buf, size_t nframes ) { //fprintf(stderr, "sf_writef_float: nframes=%ld\n", nframes); SNDFILE *s = (SNDFILE *)sa->backend_handle; diff --git a/src/simpleaudio.c b/src/simpleaudio.c index 5c68b3f..c9e4680 100644 --- a/src/simpleaudio.c +++ b/src/simpleaudio.c @@ -144,13 +144,13 @@ simpleaudio_get_samplesize( simpleaudio *sa ) } ssize_t -simpleaudio_read( simpleaudio *sa, float *buf, size_t nframes ) +simpleaudio_read( simpleaudio *sa, void *buf, size_t nframes ) { return sa->backend->simpleaudio_read(sa, buf, nframes); } ssize_t -simpleaudio_write( simpleaudio *sa, float *buf, size_t nframes ) +simpleaudio_write( simpleaudio *sa, void *buf, size_t nframes ) { return sa->backend->simpleaudio_write(sa, buf, nframes); } diff --git a/src/simpleaudio.h b/src/simpleaudio.h index 4dd8b7c..9b5f8b8 100644 --- a/src/simpleaudio.h +++ b/src/simpleaudio.h @@ -75,10 +75,10 @@ unsigned int simpleaudio_get_samplesize( simpleaudio *sa ); ssize_t -simpleaudio_read( simpleaudio *sa, float *buf, size_t nframes ); +simpleaudio_read( simpleaudio *sa, void *buf, size_t nframes ); ssize_t -simpleaudio_write( simpleaudio *sa, float *buf, size_t nframes ); +simpleaudio_write( simpleaudio *sa, void *buf, size_t nframes ); void simpleaudio_close( simpleaudio *sa ); diff --git a/src/simpleaudio_internal.h b/src/simpleaudio_internal.h index c14df0d..25a0551 100644 --- a/src/simpleaudio_internal.h +++ b/src/simpleaudio_internal.h @@ -48,10 +48,10 @@ struct simpleaudio_backend { char *app_name, char *stream_name ); ssize_t - (*simpleaudio_read)( simpleaudio *sa, float *buf, size_t nframes ); + (*simpleaudio_read)( simpleaudio *sa, void *buf, size_t nframes ); ssize_t - (*simpleaudio_write)( simpleaudio *sa, float *buf, size_t nframes ); + (*simpleaudio_write)( simpleaudio *sa, void *buf, size_t nframes ); void (*simpleaudio_close)( simpleaudio *sa );