From af98f532b1f28ad6039dcde1a7eeb33238d7f086 Mon Sep 17 00:00:00 2001 From: ZachBacon Date: Tue, 25 Dec 2018 15:29:11 -0500 Subject: [PATCH] Inbound FAudio fixes --- src/wx/faudio.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wx/faudio.cpp b/src/wx/faudio.cpp index 0dcf9217..5a1a5706 100644 --- a/src/wx/faudio.cpp +++ b/src/wx/faudio.cpp @@ -8,7 +8,7 @@ #include "../common/ConfigManager.h" #include "../common/SoundDriver.h" -// Faudio +// FAudio #include // MMDevice API @@ -25,23 +25,23 @@ int GetFADevices(FAudio* fa, wxArrayString* names, wxArrayString* ids, { HRESULT hr; UINT32 dev_count = 0; - hr = fa->FAudio_GetDeviceCount(&dev_count); + hr = FAudio_GetDeviceCount(fa, &dev_count); if (hr != S_OK) { wxLogError(_("FAudio: Enumerating devices failed!")); return true; } else { - FaudioDeviceDetails dd; + FAudioDeviceDetails dd; for (UINT32 i = 0; i < dev_count; i++) { - hr = fa->GetDeviceDetails(i, &dd); + hr = FAudio_GetDeviceDetails(fa, i, &dd); if (hr != S_OK) { continue; } else { if (ids) { - ids->push_back(dd.DeviceID); - names->push_back(dd.DisplayName); + ids->push_back((wchar_t*) dd.DeviceID); + names->push_back((wchar_t*) dd.DisplayName); } else if (*match == dd.DeviceID) return i; }