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

Fixed some windows stuff

Browse Source
This commit is contained in:
WolverinDEV 2020-02-09 00:06:42 +01:00
parent 1f58621b3b
commit 1a71df9a8a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
native/serverconnection/CMakeLists.txt
View File

@ -67,6 +67,7 @@ target_link_libraries(${MODULE_NAME} ${NODEJS_LIBRARIES})
find_package(soundio REQUIRED) find_package(soundio REQUIRED)
include_directories(${soundio_INCLUDE_DIR}) include_directories(${soundio_INCLUDE_DIR})
add_compile_definitions(SOUNDIO_STATIC_LIBRARY)
find_package(TomMath REQUIRED) find_package(TomMath REQUIRED)
include_directories(${TomMath_INCLUDE_DIR}) include_directories(${TomMath_INCLUDE_DIR})
@ -77,8 +78,10 @@ include_directories(${TomCrypt_INCLUDE_DIR})
find_package(DataPipes REQUIRED) find_package(DataPipes REQUIRED)
include_directories(${DataPipes_INCLUDE_DIR}) include_directories(${DataPipes_INCLUDE_DIR})
set(_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
find_package(Libevent REQUIRED) find_package(Libevent REQUIRED)
include_directories(${LIBEVENT_INCLUDE_DIRS}) include_directories(${LIBEVENT_INCLUDE_DIRS})
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_CMAKE_FIND_LIBRARY_SUFFIXES})
find_package(TeaSpeak_SharedLib REQUIRED) find_package(TeaSpeak_SharedLib REQUIRED)
include_directories(${TeaSpeak_SharedLib_INCLUDE_DIR}) include_directories(${TeaSpeak_SharedLib_INCLUDE_DIR})
@ -125,8 +128,7 @@ set(REQUIRED_LIBRARIES
${opus_LIBRARIES_STATIC} ${opus_LIBRARIES_STATIC}
${ed25519_LIBRARIES_STATIC} ${ed25519_LIBRARIES_STATIC}
#soundio::static soundio::static
${soundio_LIBRARIES_STATIC}
spdlog::spdlog_header_only spdlog::spdlog_header_only
Nan::Helpers Nan::Helpers

5
native/serverconnection/src/audio/driver/SoundIORecord.cpp
View File

@ -105,6 +105,11 @@ void SoundIORecord::read_callback(int frame_count_min, int frame_count_max) {
return; return;
} }
if(!areas) {
log_warn(category::audio, tr("Input audio underflow for {} ({} samples)"), this->device_handle->name, frame_count_max);
return;
}
/* test for interleaved */ /* test for interleaved */
{ {
char* begin = areas[0].ptr - sizeof(float); char* begin = areas[0].ptr - sizeof(float);

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "TeaClient", "name": "TeaClient",
"version": "1.4.2-5", "version": "1.4.3",
"description": "", "description": "",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {