Merge pull request #100 from Tilka/misc_fixes

Misc fixes

3 files changed, 8 insertions, 18 deletions

diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp
index a8229b3f84..b964b6b84a 100644
--- a/Source/Core/AudioCommon/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/AudioCommon.cpp
@@ -134,7 +134,7 @@ namespace AudioCommon
 		{
 			return true;
 		}
-		return SConfig::GetInstance().m_EnableJIT;
+		return SConfig::GetInstance().m_DSPEnableJIT;
 	}
 
 	void PauseAndLock(bool doLock, bool unpauseOnUnlock)
diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp
index 46f7cc3407..b12ee66922 100644
--- a/Source/Core/AudioCommon/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/OpenALStream.cpp
@@ -15,22 +15,19 @@ soundtouch::SoundTouch soundTouch;
 //
 bool OpenALStream::Start()
 {
-	ALDeviceList *pDeviceList = NULL;
-	ALCcontext *pContext = NULL;
-	ALCdevice *pDevice = NULL;
 	bool bReturn = false;
 
-	pDeviceList = new ALDeviceList();
+	ALDeviceList *pDeviceList = new ALDeviceList();
 	if ((pDeviceList) && (pDeviceList->GetNumDevices()))
 	{
 		char *defDevName = pDeviceList->GetDeviceName(pDeviceList->GetDefaultDevice());
 
 		WARN_LOG(AUDIO, "Found OpenAL device %s", defDevName);
 
-		pDevice = alcOpenDevice(defDevName);
+		ALCdevice *pDevice = alcOpenDevice(defDevName);
 		if (pDevice)
 		{
-			pContext = alcCreateContext(pDevice, NULL);
+			ALCcontext *pContext = alcCreateContext(pDevice, NULL);
 			if (pContext)
 			{
 				// Used to determine an appropriate period size (2x period = total buffer size)
diff --git a/Source/Core/AudioCommon/aldlist.cpp b/Source/Core/AudioCommon/aldlist.cpp
index 644e728bfe..d7c7a287c4 100644
--- a/Source/Core/AudioCommon/aldlist.cpp
+++ b/Source/Core/AudioCommon/aldlist.cpp
@@ -42,10 +42,6 @@
 ALDeviceList::ALDeviceList()
 {
 	ALDEVICEINFO ALDeviceInfo;
-	char *devices;
-	s32 index;
-	const char *defaultDeviceName = NULL;
-	const char *actualDeviceName = NULL;
 
 	// DeviceInfo vector stores, for each enumerated device, it's device name, selection status, spec version #, and extension support
 	vDeviceInfo.clear();
@@ -57,11 +53,10 @@ ALDeviceList::ALDeviceList()
 	//if (LoadOAL10Library(NULL, &ALFunction) == TRUE) {
 		if (alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT"))
 		{
-			devices = (char *)alcGetString(NULL, ALC_DEVICE_SPECIFIER);
-			defaultDeviceName = (char *)alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
-			index = 0;
+			const char *devices = alcGetString(NULL, ALC_DEVICE_SPECIFIER);
+			const char *defaultDeviceName = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
 			// go through device list (each device terminated with a single NULL, list terminated with double NULL)
-			while (devices != NULL && strlen(devices) > 0)
+			for (s32 index = 0; devices != NULL && strlen(devices) > 0; index++, devices += strlen(devices) + 1)
 			{
 				if (strcmp(defaultDeviceName, devices) == 0)
 				{
@@ -75,7 +70,7 @@ ALDeviceList::ALDeviceList()
 					{
 						alcMakeContextCurrent(context);
 						// if new actual device name isn't already in the list, then add it...
-						actualDeviceName = alcGetString(device, ALC_DEVICE_SPECIFIER);
+						const char *actualDeviceName = alcGetString(device, ALC_DEVICE_SPECIFIER);
 						bool bNewName = true;
 						for (s32 i = 0; i < GetNumDevices(); i++)
 						{
@@ -130,8 +125,6 @@ ALDeviceList::ALDeviceList()
 					}
 					alcCloseDevice(device);
 				}
-				devices += strlen(devices) + 1;
-				index += 1;
 			}
 		}
 	//}