diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-16 22:43:16 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-16 22:43:16 +0800 |
| commit | 05f6b6c827b4eebbb180483579b7c13ebc156072 (patch) | |
| tree | 9aca21e647860cba26275b0b9f75d7f9ca18889e /indra/llwebrtc/llwebrtc_impl.h | |
| parent | 0318718c166d0f6f0b3c387163826924b20fd597 (diff) | |
| parent | 6bb3e64acab73e92de2627ddef0b1e738ff24c4a (diff) | |
Merge branch 'main' into 2024.08-DeltaFPS
Diffstat (limited to 'indra/llwebrtc/llwebrtc_impl.h')
| -rw-r--r-- | indra/llwebrtc/llwebrtc_impl.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h index 6e74acf082..99accb2c20 100644 --- a/indra/llwebrtc/llwebrtc_impl.h +++ b/indra/llwebrtc/llwebrtc_impl.h @@ -184,9 +184,10 @@ class LLCustomProcessor : public webrtc::CustomProcessing // Primary singleton implementation for interfacing // with the native webrtc library. +#if CM_WEBRTC class LLWebRTCImpl : public LLWebRTCDeviceInterface -#if __x86_64__ && !__FreeBSD__ - , public webrtc::AudioDeviceSink +#else +class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceSink #endif { public: @@ -222,11 +223,11 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface // // AudioDeviceSink // - void OnDevicesUpdated() -#if __x86_64__ && !__FreeBSD__ - override +#if CM_WEBRTC + void OnDevicesUpdated(); +#else + void OnDevicesUpdated() override; #endif - ; // // Helpers |