Don't try to open the ALSA device a second time if the first fails
This commit is contained in:
parent
4c75a72a90
commit
9fa2db0227
10
Alc/alsa.c
10
Alc/alsa.c
@ -500,11 +500,6 @@ static ALCboolean alsa_open_playback(ALCdevice *device, const ALCchar *deviceNam
|
|||||||
data = (alsa_data*)calloc(1, sizeof(alsa_data));
|
data = (alsa_data*)calloc(1, sizeof(alsa_data));
|
||||||
|
|
||||||
i = psnd_pcm_open(&data->pcmHandle, driver, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
|
i = psnd_pcm_open(&data->pcmHandle, driver, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
|
||||||
if(i < 0)
|
|
||||||
{
|
|
||||||
Sleep(200);
|
|
||||||
i = psnd_pcm_open(&data->pcmHandle, driver, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
|
|
||||||
}
|
|
||||||
if(i >= 0)
|
if(i >= 0)
|
||||||
{
|
{
|
||||||
i = psnd_pcm_nonblock(data->pcmHandle, 0);
|
i = psnd_pcm_nonblock(data->pcmHandle, 0);
|
||||||
@ -799,11 +794,6 @@ static ALCboolean alsa_open_capture(ALCdevice *pDevice, const ALCchar *deviceNam
|
|||||||
|
|
||||||
i = psnd_pcm_open(&data->pcmHandle, driver, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK);
|
i = psnd_pcm_open(&data->pcmHandle, driver, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK);
|
||||||
if(i < 0)
|
if(i < 0)
|
||||||
{
|
|
||||||
Sleep(200);
|
|
||||||
i = psnd_pcm_open(&data->pcmHandle, driver, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK);
|
|
||||||
}
|
|
||||||
if(i < 0)
|
|
||||||
{
|
{
|
||||||
AL_PRINT("Could not open capture device '%s': %s\n", driver, psnd_strerror(i));
|
AL_PRINT("Could not open capture device '%s': %s\n", driver, psnd_strerror(i));
|
||||||
free(data);
|
free(data);
|
||||||
|
Loading…
Reference in New Issue
Block a user