Skip to content

Commit ba623af

Browse files
authored
[library_openal] Simplify string operations. NFC (#22084)
Split out from #22067
1 parent 2c0584a commit ba623af

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

src/library_openal.js

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2408,7 +2408,7 @@ var LibraryOpenAL = {
24082408
case 0x1005 /* ALC_DEVICE_SPECIFIER */:
24092409
if (typeof AudioContext != 'undefined' ||
24102410
typeof webkitAudioContext != 'undefined') {
2411-
ret = AL.DEVICE_NAME.concat('\0');
2411+
ret = AL.DEVICE_NAME + '\0';
24122412
} else {
24132413
ret = '\0';
24142414
}
@@ -2417,9 +2417,9 @@ var LibraryOpenAL = {
24172417
ret = AL.CAPTURE_DEVICE_NAME;
24182418
break;
24192419
case 0x310 /* ALC_CAPTURE_DEVICE_SPECIFIER */:
2420-
if (deviceId === 0)
2421-
ret = AL.CAPTURE_DEVICE_NAME.concat('\0');
2422-
else {
2420+
if (deviceId === 0) {
2421+
ret = AL.CAPTURE_DEVICE_NAME + '\0';
2422+
} else {
24232423
var c = AL.requireValidCaptureDevice(deviceId, 'alcGetString');
24242424
if (!c) {
24252425
return 0;
@@ -2433,12 +2433,7 @@ var LibraryOpenAL = {
24332433
return 0;
24342434
}
24352435
2436-
ret = '';
2437-
for (var ext in AL.ALC_EXTENSIONS) {
2438-
ret = ret.concat(ext);
2439-
ret = ret.concat(' ');
2440-
}
2441-
ret = ret.trim();
2436+
ret = Object.keys(AL.ALC_EXTENSIONS).join(' ')
24422437
break;
24432438
default:
24442439
AL.alcErr = {{{ cDefs.ALC_INVALID_ENUM }}};
@@ -3049,12 +3044,7 @@ var LibraryOpenAL = {
30493044
ret = 'WebAudio';
30503045
break;
30513046
case 0xB004 /* AL_EXTENSIONS */:
3052-
ret = '';
3053-
for (var ext in AL.AL_EXTENSIONS) {
3054-
ret = ret.concat(ext);
3055-
ret = ret.concat(' ');
3056-
}
3057-
ret = ret.trim();
3047+
ret = Object.keys(AL.AL_EXTENSIONS).join(' ');
30583048
break;
30593049
default:
30603050
if (AL.currentCtx) {

test/openal_extensions.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,20 @@ static const ALCchar *al_extensions[NUM_AL_EXTENSIONS] = {
3333
};
3434

3535
static void check_alc_extension(const ALCchar *extension) {
36+
printf("checking: %s\n", extension);
3637
ALCdevice *device = alcOpenDevice(NULL);
3738

3839
assert(device);
3940
assert(alcIsExtensionPresent(device, extension) == ALC_TRUE);
4041
}
4142

4243
static void check_al_extension(const ALchar *extension) {
44+
printf("checking: %s\n", extension);
4345
assert(alIsExtensionPresent(extension) == ALC_TRUE);
4446
}
4547

4648
int main() {
49+
printf("AL_EXTENSIONS: %s\n", alGetString(AL_EXTENSIONS));
4750

4851
for (int i = 0; i < NUM_ALC_EXTENSIONS; i++) {
4952
check_alc_extension(alc_extensions[i]);
@@ -53,5 +56,6 @@ int main() {
5356
check_al_extension(al_extensions[i]);
5457
}
5558

59+
printf("done\n");
5660
return 0;
5761
}

0 commit comments

Comments
 (0)