Skip to content
Snippets Groups Projects
Commit f4ab5daf authored by Sam Thursfield's avatar Sam Thursfield
Browse files

s_audio_alsa: Correct some error strings

The (input) and (output) markers were missing in some cases, and
incorrect in others.
parent 89203c8d
No related branches found
No related tags found
No related merge requests found
...@@ -169,7 +169,7 @@ static int alsaio_setup(t_alsa_dev *dev, int out, int *channels, int *rate, ...@@ -169,7 +169,7 @@ static int alsaio_setup(t_alsa_dev *dev, int out, int *channels, int *rate,
/* set the sampling rate */ /* set the sampling rate */
err = snd_pcm_hw_params_set_rate_min(dev->a_handle, hw_params, err = snd_pcm_hw_params_set_rate_min(dev->a_handle, hw_params,
(unsigned int *)rate, 0); (unsigned int *)rate, 0);
check_error(err, "snd_pcm_hw_params_set_rate_min (input)"); check_error(err, "snd_pcm_hw_params_set_rate_min");
#if 0 #if 0
err = snd_pcm_hw_params_get_rate(hw_params, &subunitdir); err = snd_pcm_hw_params_get_rate(hw_params, &subunitdir);
post("input sample rate %d", err); post("input sample rate %d", err);
...@@ -185,7 +185,7 @@ static int alsaio_setup(t_alsa_dev *dev, int out, int *channels, int *rate, ...@@ -185,7 +185,7 @@ static int alsaio_setup(t_alsa_dev *dev, int out, int *channels, int *rate,
err = snd_pcm_hw_params_set_period_size_near(dev->a_handle, err = snd_pcm_hw_params_set_period_size_near(dev->a_handle,
hw_params, &tmp_snd_pcm_uframes, 0); hw_params, &tmp_snd_pcm_uframes, 0);
#endif #endif
check_error(err, "snd_pcm_hw_params_set_period_size_near (input)"); check_error(err, "snd_pcm_hw_params_set_period_size_near");
/* set the buffer size */ /* set the buffer size */
#ifdef ALSAAPI9 #ifdef ALSAAPI9
...@@ -196,10 +196,10 @@ static int alsaio_setup(t_alsa_dev *dev, int out, int *channels, int *rate, ...@@ -196,10 +196,10 @@ static int alsaio_setup(t_alsa_dev *dev, int out, int *channels, int *rate,
err = snd_pcm_hw_params_set_buffer_size_near(dev->a_handle, err = snd_pcm_hw_params_set_buffer_size_near(dev->a_handle,
hw_params, &tmp_snd_pcm_uframes); hw_params, &tmp_snd_pcm_uframes);
#endif #endif
check_error(err, "snd_pcm_hw_params_set_buffer_size_near (input)"); check_error(err, "snd_pcm_hw_params_set_buffer_size_near");
err = snd_pcm_hw_params(dev->a_handle, hw_params); err = snd_pcm_hw_params(dev->a_handle, hw_params);
check_error(err, "snd_pcm_hw_params (input)"); check_error(err, "snd_pcm_hw_params");
/* set up the buffer */ /* set up the buffer */
bufsizeforthis = DEFDACBLKSIZE * dev->a_sampwidth * *channels; bufsizeforthis = DEFDACBLKSIZE * dev->a_sampwidth * *channels;
...@@ -254,7 +254,7 @@ int alsa_open_audio(int naudioindev, int *audioindev, int nchindev, ...@@ -254,7 +254,7 @@ int alsa_open_audio(int naudioindev, int *audioindev, int nchindev,
alsa_numbertoname(audioindev[iodev], devname, 512); alsa_numbertoname(audioindev[iodev], devname, 512);
err = snd_pcm_open(&alsa_indev[alsa_nindev].a_handle, devname, err = snd_pcm_open(&alsa_indev[alsa_nindev].a_handle, devname,
SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK); SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK);
check_error(err, "snd_pcm_open"); check_error(err, "snd_pcm_open (input)");
if (err < 0) if (err < 0)
continue; continue;
alsa_indev[alsa_nindev].a_devno = audioindev[iodev]; alsa_indev[alsa_nindev].a_devno = audioindev[iodev];
...@@ -268,7 +268,7 @@ int alsa_open_audio(int naudioindev, int *audioindev, int nchindev, ...@@ -268,7 +268,7 @@ int alsa_open_audio(int naudioindev, int *audioindev, int nchindev,
alsa_numbertoname(audiooutdev[iodev], devname, 512); alsa_numbertoname(audiooutdev[iodev], devname, 512);
err = snd_pcm_open(&alsa_outdev[alsa_noutdev].a_handle, devname, err = snd_pcm_open(&alsa_outdev[alsa_noutdev].a_handle, devname,
SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
check_error(err, "snd_pcm_open"); check_error(err, "snd_pcm_open (output)");
if (err < 0) if (err < 0)
continue; continue;
alsa_outdev[alsa_noutdev].a_devno = audiooutdev[iodev]; alsa_outdev[alsa_noutdev].a_devno = audiooutdev[iodev];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment