celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-27 16:16:35 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

dont dispatch udp to main

Browse Source
This commit is contained in:
ouwou
2022-09-30 01:09:51 -04:00
parent f8ae99ee7b
commit 0438b11c91
3 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/discord/voiceclient.cpp
View File

@@ -141,9 +141,7 @@ DiscordVoiceClient::DiscordVoiceClient() {
});
m_udp.signal_data().connect([this](const std::vector<uint8_t> &data) {
std::lock_guard<std::mutex> _(m_udp_dispatch_mutex);
m_udp_message_queue.push(data);
m_udp_dispatcher.emit();
OnUDPData(data);
});
m_dispatcher.connect([this]() {
@@ -158,18 +156,6 @@ DiscordVoiceClient::DiscordVoiceClient() {
OnGatewayMessage(msg);
});
m_udp_dispatcher.connect([this]() {
m_udp_dispatch_mutex.lock();
if (m_udp_message_queue.empty()) {
m_udp_dispatch_mutex.unlock();
return;
}
auto data = std::move(m_udp_message_queue.front());
m_udp_message_queue.pop();
m_udp_dispatch_mutex.unlock();
OnUDPData(data);
});
Glib::signal_idle().connect_once([this]() {
// cant put in ctor or deadlock in singleton initialization
auto &aud = Abaddon::Get().GetAudio();

4
src/discord/voiceclient.hpp
View File

@@ -235,10 +235,6 @@ private:
std::queue<std::string> m_message_queue;
std::mutex m_dispatch_mutex;
Glib::Dispatcher m_udp_dispatcher;
std::queue<std::vector<uint8_t>> m_udp_message_queue;
std::mutex m_udp_dispatch_mutex;
int m_heartbeat_msec;
Waiter m_heartbeat_waiter;
std::thread m_heartbeat_thread;