summary refs log tree commit diff
path: root/src/voip
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-11-22 00:32:49 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2021-11-22 00:33:43 +0100
commita13f492e7d587ade54606a77c4e9f497a0fea737 (patch)
treeffb115cd17450e8094e7e15e0d04f2d5d2e9a852 /src/voip
parentMerge pull request #822 from Nheko-Reborn/dm-filter (diff)
downloadnheko-a13f492e7d587ade54606a77c4e9f497a0fea737.tar.xz
Make clang-format <13 and clang-format >=13 behave the same
I think old clang-format is just buggy in those cases, so we should
reenable those blocks, once everyone has 13 or up.
Diffstat (limited to 'src/voip')
-rw-r--r--src/voip/CallDevices.h4
-rw-r--r--src/voip/WebRTCSession.cpp9
2 files changed, 10 insertions, 3 deletions
diff --git a/src/voip/CallDevices.h b/src/voip/CallDevices.h

index d30ce644..9b234903 100644 --- a/src/voip/CallDevices.h +++ b/src/voip/CallDevices.h
@@ -27,8 +27,8 @@ public: bool haveCamera() const; std::vector<std::string> names(bool isVideo, const std::string &defaultDevice) const; std::vector<std::string> resolutions(const std::string &cameraName) const; - std::vector<std::string> frameRates(const std::string &cameraName, - const std::string &resolution) const; + std::vector<std::string> + frameRates(const std::string &cameraName, const std::string &resolution) const; signals: void devicesChanged(); diff --git a/src/voip/WebRTCSession.cpp b/src/voip/WebRTCSession.cpp
index a01b3a39..27e51d9e 100644 --- a/src/voip/WebRTCSession.cpp +++ b/src/voip/WebRTCSession.cpp
@@ -1115,7 +1115,14 @@ WebRTCSession::haveLocalPiP() const return false; } -bool WebRTCSession::createOffer(webrtc::CallType, uint32_t) { return false; } +// clang-format off +// clang-format < 12 is buggy on this +bool +WebRTCSession::createOffer(webrtc::CallType, uint32_t) +{ + return false; +} +// clang-format on bool WebRTCSession::acceptOffer(const std::string &)