Skip to content
Snippets Groups Projects
Commit 9dbd8cb4 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

project: remove libupnp + pthreads, audio: patch portaudio layer for WASAPI

Change-Id: I86400ac2d3a198050fc5fe3ebaf560d56b90f5ed
parent b6f6cbd3
Branches
Tags
No related merge requests found
...@@ -62,7 +62,7 @@ systems. This function is required for `alloca.c' support on those systems. ...@@ -62,7 +62,7 @@ systems. This function is required for `alloca.c' support on those systems.
#define HAVE_LIBINTL_H 0 #define HAVE_LIBINTL_H 0
/* Define if you have libupnp */ /* Define if you have libupnp */
#define HAVE_LIBUPNP 1 #define HAVE_LIBUPNP 0
/* Define to 1 if you have the <limits.h> header file. */ /* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1 #define HAVE_LIMITS_H 1
......
...@@ -442,7 +442,7 @@ ...@@ -442,7 +442,7 @@
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
<Lib> <Lib>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;advapi32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;libsamplerate.lib;libsndfile.lib;libgnutls.lib;lib_json.lib;opendht.lib;argon.lib;blake.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;libupnp.lib;pthreadVC2.lib;portaudio.lib;libspeex-pj.lib;cryptlib.lib;libboost_random-vc140-mt-1_61.lib;libboost_random-vc140-mt-gd-1_61.lib;libboost_system-vc140-mt-1_61.lib;libboost_system-vc140-mt-gd-1_61.lib;libboost_thread-vc140-mt-1_61.lib;libboost_thread-vc140-mt-gd-1_61.lib;libboost_date_time-vc140-mt-1_61.lib;libboost_date_time-vc140-mt-gd-1_61.lib;libboost_chrono-vc140-mt-1_61.lib;libboost_chrono-vc140-mt-gd-1_61.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;advapi32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;libsamplerate.lib;libsndfile.lib;libgnutls.lib;lib_json.lib;opendht.lib;argon.lib;blake.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;PA_UWP_TEST.lib;libspeex-pj.lib;cryptlib.lib;libboost_random-vc140-mt-1_61.lib;libboost_random-vc140-mt-gd-1_61.lib;libboost_system-vc140-mt-1_61.lib;libboost_system-vc140-mt-gd-1_61.lib;libboost_thread-vc140-mt-1_61.lib;libboost_thread-vc140-mt-gd-1_61.lib;libboost_date_time-vc140-mt-1_61.lib;libboost_date_time-vc140-mt-gd-1_61.lib;libboost_chrono-vc140-mt-1_61.lib;libboost_chrono-vc140-mt-gd-1_61.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin;..\contrib\lib\x64;..\contrib\boost\stage\lib</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin;..\contrib\lib\x64;..\contrib\boost\stage\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
......
...@@ -354,7 +354,7 @@ PortAudioLayer::init() ...@@ -354,7 +354,7 @@ PortAudioLayer::init()
#ifdef WIN32_NATIVE #ifdef WIN32_NATIVE
indexRing_ = indexOut_ = Pa_GetDefaultOutputDevice(); indexRing_ = indexOut_ = Pa_GetDefaultOutputDevice();
indexIn_ = indexIn_ == Pa_GetDefaultInputDevice(); indexIn_ = Pa_GetDefaultInputDevice();
#else #else
indexRing_ = indexOut_ = indexOut_ == paNoDevice ? Pa_GetDefaultOutputDevice() : indexOut_; indexRing_ = indexOut_ = indexOut_ == paNoDevice ? Pa_GetDefaultOutputDevice() : indexOut_;
indexIn_ = indexIn_ == paNoDevice ? Pa_GetDefaultInputDevice() : indexIn_; indexIn_ = indexIn_ == paNoDevice ? Pa_GetDefaultInputDevice() : indexIn_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment