Minki/abaddon-ppc
1
0
Fork 0
forked from OpenGamers/abaddon
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actually reconstruct websocket on voice connect

Browse Source
This commit is contained in:
ouwou
2022-11-15 15:38:39 -05:00
parent 929ebf1a60
commit afaba05293
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/discord/voiceclient.cpp
View File

@@ -130,27 +130,6 @@ DiscordVoiceClient::DiscordVoiceClient() {
spdlog::get("voice")->critical("sodium_init() failed"); spdlog::get("voice")->critical("sodium_init() failed");
} }
m_ws = std::make_unique<Websocket>("voice-ws");
m_ws->signal_open().connect([this]() {
spdlog::get("voice")->info("Websocket open");
SetState(State::Opened);
});
m_ws->signal_close().connect([this](const ix::WebSocketCloseInfo &info) {
if (info.remote) {
SetState(State::ClosingByServer);
}
Stop();
});
m_ws->signal_message().connect([this](const std::string &str) {
spdlog::get("voice-ws")->trace("Recv: {}", str);
std::lock_guard<std::mutex> _(m_dispatch_mutex);
m_message_queue.push(str);
m_dispatcher.emit();
});
m_udp.signal_data().connect([this](const std::vector<uint8_t> &data) { m_udp.signal_data().connect([this](const std::vector<uint8_t> &data) {
OnUDPData(data); OnUDPData(data);
}); });
@@ -183,6 +162,27 @@ DiscordVoiceClient::~DiscordVoiceClient() {
} }
void DiscordVoiceClient::Start() { void DiscordVoiceClient::Start() {
m_ws = std::make_unique<Websocket>("voice-ws");
m_ws->signal_open().connect([this]() {
spdlog::get("voice")->info("Websocket open");
SetState(State::Opened);
});
m_ws->signal_close().connect([this](const ix::WebSocketCloseInfo &info) {
if (info.remote) {
SetState(State::ClosingByServer);
}
Stop();
});
m_ws->signal_message().connect([this](const std::string &str) {
spdlog::get("voice-ws")->trace("Recv: {}", str);
std::lock_guard<std::mutex> _(m_dispatch_mutex);
m_message_queue.push(str);
m_dispatcher.emit();
});
SetState(State::Opening); SetState(State::Opening);
m_ws->StartConnection("wss://" + m_endpoint + "/?v=7"); m_ws->StartConnection("wss://" + m_endpoint + "/?v=7");
m_heartbeat_waiter.revive(); m_heartbeat_waiter.revive();