Fix Unicode issues in SPU2-X with PortAudio.

PCSX2 · Aug 7, 2015 · 0e533e1 · 0e533e1
1 parent 2c4cda1
commit 0e533e1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/plugins/spu2-x/src/SndOut_Portaudio.cpp b/plugins/spu2-x/src/SndOut_Portaudio.cpp
@@ -147,7 +147,7 @@ class Portaudio : public SndOutModule
 
 				if(apiinfo->type == m_ApiId)
 				{
-					if(m_Device == wxString::FromAscii(info->name))
+					if(m_Device == wxString::FromUTF8(info->name))
 					{
 						deviceIndex = i;
 						fprintf(stderr," (selected)");
@@ -386,9 +386,9 @@ class Portaudio : public SndOutModule
 						const PaDeviceInfo * info = Pa_GetDeviceInfo(j);
 						if(info->hostApi == api_idx && info->maxOutputChannels > 0)
 						{
-							SendMessageA(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_ADDSTRING,0,(LPARAM)info->name);
+							SendMessage(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_ADDSTRING,0,(LPARAM)wxString::FromUTF8(info->name).wc_str());
 							SendMessage(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_SETITEMDATA,i,(LPARAM)info);			
-							if(wxString::FromAscii(info->name) == m_Device)
+							if(wxString::FromUTF8(info->name) == m_Device)
 							{
 								_idx = i;
 							}
@@ -429,7 +429,7 @@ class Portaudio : public SndOutModule
 						idx = (int)SendMessage(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_GETCURSEL,0,0);
 						const PaDeviceInfo * info = (const PaDeviceInfo *)SendMessage(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_GETITEMDATA,idx,0);
 						if(info)
-							m_Device = wxString::FromAscii( info->name );
+							m_Device = wxString::FromUTF8( info->name );
 						else
 							m_Device = L"default";
 
@@ -466,7 +466,7 @@ class Portaudio : public SndOutModule
 								const PaDeviceInfo * info = Pa_GetDeviceInfo(j);
 								if(info->hostApi == api_idx && info->maxOutputChannels > 0)
 								{
-									SendMessageA(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_ADDSTRING,0,(LPARAM)info->name);
+									SendMessage(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_ADDSTRING,0,(LPARAM)wxString::FromUTF8(info->name).wc_str());
 									SendMessage(GetDlgItem(hWnd,IDC_PA_DEVICE),CB_SETITEMDATA,i,(LPARAM)info);
 									i++;
 								}