diff --git a/src/detection/sound/sound_windows.cpp b/src/detection/sound/sound_windows.cpp index c0cb58d5a..046ffd840 100644 --- a/src/detection/sound/sound_windows.cpp +++ b/src/detection/sound/sound_windows.cpp @@ -1,8 +1,9 @@ extern "C" { #include "sound.h" - #include "common/windows/unicode.h" } +#include "common/windows/unicode.hpp" #include "common/windows/com.hpp" +#include "common/windows/variant.hpp" #include #include @@ -76,10 +77,9 @@ const char* ffDetectSound(FFlist* devices /* List of FFSoundDevice */) ffStrbufInitStatic(&device->platformApi, "Core Audio APIs"); { - PROPVARIANT __attribute__((__cleanup__(PropVariantClear))) friendlyName; - PropVariantInit(&friendlyName); + FFPropVariant friendlyName; if (SUCCEEDED(immPropStore->GetValue(PKEY_Device_FriendlyName, &friendlyName))) - ffStrbufSetWS(&device->name, friendlyName.pwszVal); + ffStrbufSetWSV(&device->name, friendlyName.get()); } IAudioEndpointVolume* FF_AUTO_RELEASE_COM_OBJECT immEndpointVolume;