From 78e84521507a3aa4760ec81ac62943165f5218cd Mon Sep 17 00:00:00 2001 From: dheijl Date: Thu, 10 Sep 2020 15:32:18 +0200 Subject: [PATCH 1/3] Reenable WasApi loopback --- src/host/wasapi/device.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/host/wasapi/device.rs b/src/host/wasapi/device.rs index 6173b82..114e4ab 100644 --- a/src/host/wasapi/device.rs +++ b/src/host/wasapi/device.rs @@ -33,8 +33,7 @@ use super::winapi::um::audioclient::{ self, IAudioClient, IID_IAudioClient, AUDCLNT_E_DEVICE_INVALIDATED, }; use super::winapi::um::audiosessiontypes::{ - AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, -}; + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, AUDCLNT_STREAMFLAGS_LOOPBACK}; use super::winapi::um::combaseapi::{ CoCreateInstance, CoTaskMemFree, PropVariantClear, CLSCTX_ALL, }; @@ -657,6 +656,13 @@ impl Device { BufferSize::Default => (), }; + let mut stream_flags: DWORD = AUDCLNT_STREAMFLAGS_EVENTCALLBACK; + + if self.data_flow() == eRender { + stream_flags |= AUDCLNT_STREAMFLAGS_LOOPBACK; + } + + // Computing the format and initializing the device. // Computing the format and initializing the device. let waveformatex = { let format_attempt = config_to_waveformatextensible(config, sample_format) @@ -673,7 +679,7 @@ impl Device { // finally initializing the audio client let hresult = (*audio_client).Initialize( share_mode, - AUDCLNT_STREAMFLAGS_EVENTCALLBACK, + stream_flags, 0, 0, &format_attempt.Format, From 0d37421b45e42bdca0e731e6dc806c1d17aa622c Mon Sep 17 00:00:00 2001 From: dheijl Date: Sun, 20 Sep 2020 16:01:59 +0200 Subject: [PATCH 2/3] rust format --- src/host/wasapi/device.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/host/wasapi/device.rs b/src/host/wasapi/device.rs index 114e4ab..64d1012 100644 --- a/src/host/wasapi/device.rs +++ b/src/host/wasapi/device.rs @@ -33,7 +33,8 @@ use super::winapi::um::audioclient::{ self, IAudioClient, IID_IAudioClient, AUDCLNT_E_DEVICE_INVALIDATED, }; use super::winapi::um::audiosessiontypes::{ - AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, AUDCLNT_STREAMFLAGS_LOOPBACK}; + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, AUDCLNT_STREAMFLAGS_LOOPBACK +}; use super::winapi::um::combaseapi::{ CoCreateInstance, CoTaskMemFree, PropVariantClear, CLSCTX_ALL, }; @@ -662,7 +663,6 @@ impl Device { stream_flags |= AUDCLNT_STREAMFLAGS_LOOPBACK; } - // Computing the format and initializing the device. // Computing the format and initializing the device. let waveformatex = { let format_attempt = config_to_waveformatextensible(config, sample_format) From 1e9689ef487e290a385124578db66813cb217f71 Mon Sep 17 00:00:00 2001 From: dheijl Date: Sun, 20 Sep 2020 17:00:51 +0200 Subject: [PATCH 3/3] rust format --all --- src/host/wasapi/device.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/host/wasapi/device.rs b/src/host/wasapi/device.rs index 64d1012..be9de5d 100644 --- a/src/host/wasapi/device.rs +++ b/src/host/wasapi/device.rs @@ -33,7 +33,7 @@ use super::winapi::um::audioclient::{ self, IAudioClient, IID_IAudioClient, AUDCLNT_E_DEVICE_INVALIDATED, }; use super::winapi::um::audiosessiontypes::{ - AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, AUDCLNT_STREAMFLAGS_LOOPBACK + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, AUDCLNT_STREAMFLAGS_LOOPBACK, }; use super::winapi::um::combaseapi::{ CoCreateInstance, CoTaskMemFree, PropVariantClear, CLSCTX_ALL,