From 5a2e884d143f6543d2b45cc4238c684f6ff7ebf2 Mon Sep 17 00:00:00 2001 From: jpark37 Date: Sat, 25 Sep 2021 12:05:12 -0700 Subject: [PATCH] win-wasapi: Simplify sample rate logging --- plugins/win-wasapi/win-wasapi.cpp | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/plugins/win-wasapi/win-wasapi.cpp b/plugins/win-wasapi/win-wasapi.cpp index b1e2fb900..bc2d7ce24 100644 --- a/plugins/win-wasapi/win-wasapi.cpp +++ b/plugins/win-wasapi/win-wasapi.cpp @@ -10,6 +10,7 @@ #include #include +#include #include using namespace std; @@ -32,7 +33,6 @@ class WASAPISource { wstring default_id; string device_id; string device_name; - string device_sample = "-"; uint64_t lastNotifyTime = 0; bool isInputDevice; bool useDeviceTiming = false; @@ -374,9 +374,6 @@ void WASAPISource::InitCapture() client->Start(); active = true; - - blog(LOG_INFO, "WASAPI: Device '%s' [%s Hz] initialized", - device_name.c_str(), device_sample.c_str()); } void WASAPISource::Initialize() @@ -385,30 +382,13 @@ void WASAPISource::Initialize() device_name = GetDeviceName(device); - HRESULT resSample; - IPropertyStore *store = nullptr; - PWAVEFORMATEX deviceFormatProperties; - PROPVARIANT prop; - resSample = device->OpenPropertyStore(STGM_READ, &store); - if (!FAILED(resSample)) { - resSample = - store->GetValue(PKEY_AudioEngine_DeviceFormat, &prop); - if (!FAILED(resSample)) { - if (prop.vt != VT_EMPTY && prop.blob.pBlobData) { - deviceFormatProperties = - (PWAVEFORMATEX)prop.blob.pBlobData; - device_sample = std::to_string( - deviceFormatProperties->nSamplesPerSec); - } - } - - store->Release(); - } - InitClient(device); if (!isInputDevice) InitRender(device); InitCapture(); + + blog(LOG_INFO, "WASAPI: Device '%s' [%" PRIu32 " Hz] initialized", + device_name.c_str(), sampleRate); } bool WASAPISource::TryInitialize()