From a7c6a5f7e899c3a90b37973fd878254b343a515a Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 15 Feb 2016 18:45:05 +1100 Subject: alsa_driver: Improve error handling --- drivers/alsa/alsa_driver.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/alsa/alsa_driver.c b/drivers/alsa/alsa_driver.c index f9fda3c..c7dd724 100644 --- a/drivers/alsa/alsa_driver.c +++ b/drivers/alsa/alsa_driver.c @@ -688,11 +688,23 @@ alsa_driver_set_parameters (alsa_driver_t *driver, err = snd_pcm_hw_params_get_period_size ( driver->playback_hw_params, &p_period_size, &dir); + if (err != 0) + jack_error ("snd_pcm_hw_params_get_period_size (playback) : %s", + snd_strerror (err)); + err = snd_pcm_hw_params_get_format ( driver->playback_hw_params, &(driver->playback_sample_format)); + if (err != 0) + jack_error ("snd_pcm_hw_params_get_format (playback) : %s", + snd_strerror (err)); + err = snd_pcm_hw_params_get_access (driver->playback_hw_params, &access); + if (err != 0) + jack_error ("snd_pcm_hw_params_get_access (playback) : %s", + snd_strerror (err)); + driver->playback_interleaved = (access == SND_PCM_ACCESS_MMAP_INTERLEAVED) || (access == SND_PCM_ACCESS_MMAP_COMPLEX); @@ -711,11 +723,23 @@ alsa_driver_set_parameters (alsa_driver_t *driver, err = snd_pcm_hw_params_get_period_size ( driver->capture_hw_params, &c_period_size, &dir); + if (err != 0) + jack_error ("snd_pcm_hw_params_get_period_size (capture): %s", + snd_strerror (err)); + err = snd_pcm_hw_params_get_format ( driver->capture_hw_params, &(driver->capture_sample_format)); + if (err != 0) + jack_error ("snd_pcm_hw_params_get_format (capture) : %s", + snd_strerror (err)); + err = snd_pcm_hw_params_get_access (driver->capture_hw_params, &access); + if (err != 0) + jack_error ("snd_pcm_hw_params_get_access (capture) : %s", + snd_strerror (err)); + driver->capture_interleaved = (access == SND_PCM_ACCESS_MMAP_INTERLEAVED) || (access == SND_PCM_ACCESS_MMAP_COMPLEX); -- cgit v1.2.1