From fc9b6175b0f0b1ea5ac09926029b60e7c1336179 Mon Sep 17 00:00:00 2001 From: Grishka Date: Mon, 4 Jun 2018 22:59:58 +0300 Subject: [PATCH] Fixes --- VoIPController.cpp | 2 +- VoIPController.h | 16 +++++++--------- VoIPGroupController.cpp | 1 + 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/VoIPController.cpp b/VoIPController.cpp index 820f8b770e..4a1f63d65c 100644 --- a/VoIPController.cpp +++ b/VoIPController.cpp @@ -2709,7 +2709,7 @@ void VoIPController::SendExtra(Buffer &data, unsigned char type){ } -void VoIPController::SetConfig(Config& cfg){ +void VoIPController::SetConfig(const Config& cfg){ config=cfg; if(tgvoipLogFile){ fclose(tgvoipLogFile); diff --git a/VoIPController.h b/VoIPController.h index 8ad1f60830..848f0f0ec8 100644 --- a/VoIPController.h +++ b/VoIPController.h @@ -163,16 +163,14 @@ namespace tgvoip{ friend class VoIPGroupController; public: struct Config{ - Config(){ - } - - Config(double initTimeout, double recvTimeout, int dataSaving, bool enableAEC=false, bool enableNS=false, bool enableAGC=false){ + Config(double initTimeout, double recvTimeout, int dataSaving=DATA_SAVING_NEVER, bool enableAEC=false, bool enableNS=false, bool enableAGC=false, bool enableCallUpgrade=false){ this->initTimeout=initTimeout; this->recvTimeout=recvTimeout; this->dataSaving=dataSaving; this->enableAEC=enableAEC; this->enableNS=enableNS; this->enableAGC=enableAGC; + this->enableCallUpgrade=enableCallUpgrade; } double initTimeout; @@ -181,11 +179,11 @@ namespace tgvoip{ std::string logFilePath=""; std::string statsDumpFilePath=""; - bool enableAEC=false; - bool enableNS=false; - bool enableAGC=false; + bool enableAEC; + bool enableNS; + bool enableAGC; - bool enableCallUpgrade=false; + bool enableCallUpgrade; }; struct TrafficStats{ @@ -252,7 +250,7 @@ namespace tgvoip{ * * @param cfg */ - void SetConfig(Config& cfg); + void SetConfig(const Config& cfg); float GetOutputLevel(); void DebugCtl(int request, int param); /** diff --git a/VoIPGroupController.cpp b/VoIPGroupController.cpp index 5c2fc21d02..13c271e746 100644 --- a/VoIPGroupController.cpp +++ b/VoIPGroupController.cpp @@ -10,6 +10,7 @@ #include "PrivateDefines.h" #include #include +#include using namespace tgvoip; using namespace std;