update
This commit is contained in:
parent
c45b30924c
commit
e8874acc69
|
@ -7,8 +7,8 @@ add_subdirectory(libtgvoip)
|
||||||
|
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
find_package(Td 1.7.10 REQUIRED)
|
find_package(Td 1.8.0 REQUIRED)
|
||||||
find_package(spdlog 0.17 REQUIRED)
|
find_package(spdlog 1.11.0 REQUIRED)
|
||||||
pkg_check_modules(PJSIP libpjproject>=2.8 REQUIRED)
|
pkg_check_modules(PJSIP libpjproject>=2.8 REQUIRED)
|
||||||
pkg_check_modules(OPUS opus REQUIRED)
|
pkg_check_modules(OPUS opus REQUIRED)
|
||||||
|
|
||||||
|
|
|
@ -2525,7 +2525,7 @@ BOOST_SML_NAMESPACE_END
|
||||||
#if defined(__clang__)
|
#if defined(__clang__)
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
#elif defined(__GNUC__)
|
#elif defined(__GNUC__)
|
||||||
#undef __has_builtin
|
//#undef __has_builtin
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#elif defined(_MSC_VER)
|
#elif defined(_MSC_VER)
|
||||||
#undef __has_builtin
|
#undef __has_builtin
|
||||||
|
|
|
@ -4,7 +4,7 @@ find_package(PkgConfig REQUIRED)
|
||||||
pkg_check_modules(OPUS opus REQUIRED)
|
pkg_check_modules(OPUS opus REQUIRED)
|
||||||
pkg_check_modules(OPENSSL openssl REQUIRED)
|
pkg_check_modules(OPENSSL openssl REQUIRED)
|
||||||
pkg_check_modules(PJSIP libpjproject>=2.8 REQUIRED)
|
pkg_check_modules(PJSIP libpjproject>=2.8 REQUIRED)
|
||||||
find_package(spdlog 0.17)
|
find_package(spdlog 1.11.0)
|
||||||
|
|
||||||
add_library(libtgvoip STATIC
|
add_library(libtgvoip STATIC
|
||||||
BlockingQueue.cpp
|
BlockingQueue.cpp
|
||||||
|
|
|
@ -85,6 +85,7 @@ AudioIO* AudioIO::Create(std::string inputDevice, std::string outputDevice){
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AudioIO::Failed(){
|
bool AudioIO::Failed(){
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <td/telegram/Log.h>
|
#include <td/telegram/Log.h>
|
||||||
#include "logging.h"
|
#include "logging.h"
|
||||||
|
#include <spdlog/sinks/rotating_file_sink.h>
|
||||||
|
|
||||||
void init_logging(Settings &settings) {
|
void init_logging(Settings &settings) {
|
||||||
|
|
||||||
|
@ -62,4 +63,4 @@ void init_logging(Settings &settings) {
|
||||||
spdlog::get("pjsip")->set_level(static_cast<spdlog::level::level_enum>(settings.pjsip_log_level()));
|
spdlog::get("pjsip")->set_level(static_cast<spdlog::level::level_enum>(settings.pjsip_log_level()));
|
||||||
spdlog::get("tgvoip")->set_level(static_cast<spdlog::level::level_enum>(settings.tgvoip_log_level()));
|
spdlog::get("tgvoip")->set_level(static_cast<spdlog::level::level_enum>(settings.tgvoip_log_level()));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <queue>
|
#include <queue>
|
||||||
|
#include <optional>
|
||||||
#include <condition_variable>
|
#include <condition_variable>
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
|
|
|
@ -17,5 +17,6 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
#include <string>
|
||||||
|
|
||||||
bool is_digits(const std::string &str) { return std::all_of(str.begin(), str.end(), ::isdigit); };
|
bool is_digits(const std::string &str) { return std::all_of(str.begin(), str.end(), ::isdigit); };
|
||||||
|
|
Loading…
Reference in New Issue