From ea06b977fabd88a3e22c89021ae8020baeebb427 Mon Sep 17 00:00:00 2001 From: Taylor Holberton Date: Thu, 6 Apr 2017 23:14:14 -0700 Subject: simplified pcm_read() and pcm_write() --- src/pcm.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/pcm.c') diff --git a/src/pcm.c b/src/pcm.c index 63afeb0..b4bbda1 100644 --- a/src/pcm.c +++ b/src/pcm.c @@ -48,6 +48,7 @@ #include #include +#include #define PARAM_MAX SNDRV_PCM_HW_PARAM_LAST_INTERVAL #define SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP (1<<2) @@ -626,11 +627,7 @@ int pcm_readi(struct pcm *pcm, void *data, unsigned int frame_count) */ int pcm_write(struct pcm *pcm, const void *data, unsigned int count) { - int ret = pcm_writei(pcm, data, pcm_bytes_to_frames(pcm, count)); - if (ret < 0){ - return ret; - } - return 0; + return pcm_writei(pcm, data, pcm_bytes_to_frames(pcm, count)); } /** Reads audio samples from PCM. @@ -646,11 +643,7 @@ int pcm_write(struct pcm *pcm, const void *data, unsigned int count) */ int pcm_read(struct pcm *pcm, void *data, unsigned int count) { - int ret = pcm_readi(pcm, data, pcm_bytes_to_frames(pcm, count)); - if (ret < 0) { - return ret; - } - return 0; + return pcm_readi(pcm, data, pcm_bytes_to_frames(pcm, count)); } static struct pcm bad_pcm = { -- cgit v1.2.3