diff options
| -rw-r--r-- | Alc/backends/qsa.c | 26 | ||||
| -rw-r--r-- | alsoftrc.sample | 8 |
2 files changed, 8 insertions, 26 deletions
diff --git a/Alc/backends/qsa.c b/Alc/backends/qsa.c index fac07cef..89b67ddf 100644 --- a/Alc/backends/qsa.c +++ b/Alc/backends/qsa.c @@ -255,22 +255,16 @@ FORCE_ALIGN static int qsa_proc_playback(void* ptr) static ALCenum qsa_open_playback(ALCdevice* device, const ALCchar* deviceName) { - qsa_data* data; - char driver[64]; - int status; + qsa_data *data; int card, dev; + int status; - strncpy(driver, GetConfigValue("qsa", "device", qsaDevice), sizeof(driver)-1); - driver[sizeof(driver)-1]=0; - - data=(qsa_data*)calloc(1, sizeof(qsa_data)); - if (data==NULL) - { + data = (qsa_data*)calloc(1, sizeof(qsa_data)); + if(data == NULL) return ALC_OUT_OF_MEMORY; - } if(!deviceName) - deviceName = driver; + deviceName = qsaDevice; if(strcmp(deviceName, qsaDevice) == 0) status = snd_pcm_open_preferred(&data->pcmHandle, &card, &dev, SND_PCM_OPEN_PLAYBACK); @@ -605,15 +599,11 @@ static void qsa_stop_playback(ALCdevice* device) static ALCenum qsa_open_capture(ALCdevice* device, const ALCchar* deviceName) { - qsa_data* data; - int format=-1; - char driver[64]; + qsa_data *data; int card, dev; + int format=-1; int status; - strncpy(driver, GetConfigValue("qsa", "capture", qsaDevice), sizeof(driver)-1); - driver[sizeof(driver)-1]=0; - data=(qsa_data*)calloc(1, sizeof(qsa_data)); if (data==NULL) { @@ -621,7 +611,7 @@ static ALCenum qsa_open_capture(ALCdevice* device, const ALCchar* deviceName) } if(!deviceName) - deviceName=driver; + deviceName = qsaDevice; if(strcmp(deviceName, qsaDevice) == 0) status = snd_pcm_open_preferred(&data->pcmHandle, &card, &dev, SND_PCM_OPEN_CAPTURE); diff --git a/alsoftrc.sample b/alsoftrc.sample index 2e6dd92a..705ca4c3 100644 --- a/alsoftrc.sample +++ b/alsoftrc.sample @@ -332,14 +332,6 @@ ## [qsa] -## device: -# Sets the device name for the default playback device. -#device = default - -## capture: -# Sets the device name for the default capture device. -#capture = default - ## ## MMDevApi backend stuff ## |