TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updating some revs

Browse Source
This commit is contained in:
WolverinDEV 2020-04-03 13:50:20 +02:00
parent e439d4bc39
commit 95d52e4997
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-teaspeak

@ -1 +1 @@
Subproject commit 59e57218969572d50fd9f014ab5df59046b7a196
Subproject commit 9f4f5e72a7fc35d0c9e7faf1678cd168daf90ab9

2
music

@ -1 +1 @@
Subproject commit 4c7bc8ef8fe8d768883b31d29677baac81a3fb90
Subproject commit 39fa2c60737152f8c60710c541698d83d8fdcd7f

2
server/src/Configuration.cpp
View File

@ -1352,12 +1352,14 @@ std::deque<std::shared_ptr<EntryBinding>> config::create_bindings() {
}
/* TeaSpeak */
/*
{
CREATE_BINDING("teaspeak", FLAG_RELOADABLE);
BIND_BOOL(config::server::clients::teaspeak, true);
ADD_DESCRIPTION("Allow/disallow the TeaSpeak - Client to join the server.");
ADD_NOTE_RELOADABLE();
}
*/
{
CREATE_BINDING("teaspeak_message", FLAG_RELOADABLE);
BIND_STRING(config::server::clients::extra_welcome_message_teaspeak, "");

4
server/src/client/web/VoiceBridge.cpp
View File

@ -154,12 +154,12 @@ void VoiceBridge::remote_ice_finished() {
}
std::string VoiceBridge::generate_answer() {
return this->connection->generate_answer(true);
return this->connection->generate_answer(false);
}
void VoiceBridge::execute_tick() {
if(!this->_voice_channel) {
if(this->offer_timestamp.time_since_epoch().count() > 0 && this->offer_timestamp + chrono::seconds(10) < chrono::system_clock::now()) {
if(this->offer_timestamp.time_since_epoch().count() > 0 && this->offer_timestamp + chrono::seconds{20} < chrono::system_clock::now()) {
this->offer_timestamp = chrono::system_clock::time_point();
this->connection->callback_setup_fail(rtc::PeerConnection::ConnectionComponent::BASE, "setup timeout");
}

2
shared

@ -1 +1 @@
Subproject commit 0bfcb27002c7431d36aaa913d0f64f5a8b119d2b
Subproject commit fab6aa90954bc85efad8a0b5a3608cb408202a17