AerialX/openal-soft-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the "via *" portion of the enumerated devices

Browse Source
This commit is contained in:
Chris Robinson 2011-08-19 01:59:03 -07:00
parent 3d722b9ba0
commit e8e1286572
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Alc/alsa.c
View File

@ -327,7 +327,7 @@ static DevMap *probe_devices(snd_pcm_stream_t stream, ALuint *count)
DevList = temp; DevList = temp;
cname = snd_ctl_card_info_get_name(info); cname = snd_ctl_card_info_get_name(info);
dname = snd_pcm_info_get_name(pcminfo); dname = snd_pcm_info_get_name(pcminfo);
snprintf(name, sizeof(name), "%s [%s] (hw:%d,%d) via ALSA", snprintf(name, sizeof(name), "%s [%s] (hw:%d,%d)",
cname, dname, card, dev); cname, dname, card, dev);
DevList[idx].name = strdup(name); DevList[idx].name = strdup(name);
DevList[idx].card = card; DevList[idx].card = card;

4
Alc/dsound.c
View File

@ -140,9 +140,9 @@ static BOOL CALLBACK DSoundEnumDevices(LPGUID guid, LPCSTR desc, LPCSTR drvname,
count = 0; count = 0;
do { do {
if(count == 0) if(count == 0)
snprintf(str, sizeof(str), "%s via DirectSound", desc); snprintf(str, sizeof(str), "%s", desc);
else else
snprintf(str, sizeof(str), "%s #%d via DirectSound", desc, count+1); snprintf(str, sizeof(str), "%s #%d", desc, count+1);
count++; count++;
for(i = 0;i < NumDevices;i++) for(i = 0;i < NumDevices;i++)

8
Alc/pulseaudio.c
View File

@ -571,9 +571,9 @@ static void sink_device_callback(pa_context *context, const pa_sink_info *info,
count = 0; count = 0;
do { do {
if(count == 0) if(count == 0)
snprintf(str, sizeof(str), "%s via PulseAudio", info->description); snprintf(str, sizeof(str), "%s", info->description);
else else
snprintf(str, sizeof(str), "%s #%d via PulseAudio", info->description, count+1); snprintf(str, sizeof(str), "%s #%d", info->description, count+1);
count++; count++;
for(i = 0;i < numDevNames;i++) for(i = 0;i < numDevNames;i++)
@ -612,9 +612,9 @@ static void source_device_callback(pa_context *context, const pa_source_info *in
count = 0; count = 0;
do { do {
if(count == 0) if(count == 0)
snprintf(str, sizeof(str), "%s via PulseAudio", info->description); snprintf(str, sizeof(str), "%s", info->description);
else else
snprintf(str, sizeof(str), "%s #%d via PulseAudio", info->description, count+1); snprintf(str, sizeof(str), "%s #%d", info->description, count+1);
count++; count++;
for(i = 0;i < numCaptureDevNames;i++) for(i = 0;i < numCaptureDevNames;i++)

8
Alc/winmm.c
View File

@ -83,9 +83,9 @@ static void ProbePlaybackDevices(void)
count = 0; count = 0;
do { do {
if(count == 0) if(count == 0)
snprintf(name, sizeof(name), "%s via WaveOut", WaveCaps.szPname); snprintf(name, sizeof(name), "%s", WaveCaps.szPname);
else else
snprintf(name, sizeof(name), "%s #%d via WaveOut", WaveCaps.szPname, count+1); snprintf(name, sizeof(name), "%s #%d", WaveCaps.szPname, count+1);
count++; count++;
for(j = 0;j < i;j++) for(j = 0;j < i;j++)
@ -122,9 +122,9 @@ static void ProbeCaptureDevices(void)
count = 0; count = 0;
do { do {
if(count == 0) if(count == 0)
snprintf(name, sizeof(name), "%s via WaveIn", WaveInCaps.szPname); snprintf(name, sizeof(name), "%s", WaveInCaps.szPname);
else else
snprintf(name, sizeof(name), "%s #%d via WaveIn", WaveInCaps.szPname, count+1); snprintf(name, sizeof(name), "%s #%d", WaveInCaps.szPname, count+1);
count++; count++;
for(j = 0;j < i;j++) for(j = 0;j < i;j++)