Fix bug where console stack was incorrectly used to print audio devices

This commit is contained in:
James Urquhart 2014-11-07 23:47:05 +00:00
parent 1b06b0d92e
commit d041cbbb7a

View file

@ -1254,7 +1254,9 @@ DefineEngineFunction( sfxGetAvailableDevices, const char*, (),,
"@ingroup SFX" ) "@ingroup SFX" )
{ {
char* deviceList = Con::getReturnBuffer( 2048 ); char* deviceList = Con::getReturnBuffer( 2048 );
deviceList[0] = 0; S32 len = 2048;
char *ptr = deviceList;
*ptr = 0;
SFXProvider* provider = SFXProvider::getFirstProvider(); SFXProvider* provider = SFXProvider::getFirstProvider();
while ( provider ) while ( provider )
@ -1264,14 +1266,15 @@ DefineEngineFunction( sfxGetAvailableDevices, const char*, (),,
for ( S32 d=0; d < deviceInfo.size(); d++ ) for ( S32 d=0; d < deviceInfo.size(); d++ )
{ {
const SFXDeviceInfo* info = deviceInfo[d]; const SFXDeviceInfo* info = deviceInfo[d];
dStrcat( deviceList, provider->getName() ); const char *providerName = provider->getName().c_str();
dStrcat( deviceList, "\t" ); const char *infoName = info->name.c_str();
dStrcat( deviceList, info->name ); dSprintf(ptr, len, "%s\t%s\t%s\t%i\n", providerName, infoName, info->hasHardware ? "1" : "0", info->maxBuffers);
dStrcat( deviceList, "\t" );
dStrcat( deviceList, info->hasHardware ? "1" : "0" ); ptr += dStrlen(deviceList);
dStrcat( deviceList, "\t" ); len = 2048 - (ptr - deviceList);
dStrcat( deviceList, Con::getIntArg( info->maxBuffers ) );
dStrcat( deviceList, "\n" ); if (len <= 0)
return deviceList;
//TODO: caps //TODO: caps
} }