Skip to content

Commit 4983642

Browse files
authored
Merge pull request #265 from MadDeCoDeR/frappedia
Merge latest commit by the Admin
2 parents 56b7007 + 20a118b commit 4983642

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

neo/sound/OpenAL/AL_SoundHardware.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ If you have questions concerning this license or the applicable additional terms
3333
#include "../../../doomclassic/doom/i_sound_openal.h"
3434
#include "AL/alext.h"
3535

36-
LPALCREOPENDEVICESOFT alcReopenDeviceSOFTRef = (LPALCREOPENDEVICESOFT)alGetProcAddress("alcReopenDeviceSOFT");
36+
LPALCREOPENDEVICESOFT alcReopenDeviceSOFTRef;
3737

3838

3939

@@ -60,7 +60,7 @@ idSoundHardware_OpenAL::idSoundHardware_OpenAL(): idSoundHardware()
6060
voices.SetNum( 0 );
6161
zombieVoices.SetNum( 0 );
6262
freeVoices.SetNum( 0 );
63-
63+
alcReopenDeviceSOFTRef = (LPALCREOPENDEVICESOFT)alGetProcAddress("alcReopenDeviceSOFT");
6464
//lastResetTime = 0;
6565
}
6666

@@ -166,13 +166,6 @@ void idSoundHardware_OpenAL::parseDeviceName(const ALCchar* wcDevice, char* mbDe
166166
MultiByteToWideChar(CP_UTF8, NULL, wcDevice, -1, wdevs, wdev_size);
167167
Sys_Wcstrtombstr(mbDevice, wdevs, wdev_size);
168168
delete[] wdevs;
169-
#else
170-
wchar_t* wdevs = new wchar_t[512];
171-
int wdev_size = mbstowcs(wdevs, wcDevice, strlen(wcDevice));
172-
wdevs[wdev_size] = '\0';
173-
int mb_size = wcstombs(mbDevice, wdevs, wdev_size);
174-
mbDevice[mb_size] = '\0';
175-
delete[] wdevs;
176169
#endif
177170
}
178171

0 commit comments

Comments
 (0)