From 9dbd8cb4e3f13a26c290a86b9a410ef2779943f6 Mon Sep 17 00:00:00 2001
From: atraczyk <andreastraczyk@gmail.com>
Date: Fri, 14 Oct 2016 17:00:37 -0400
Subject: [PATCH] project: remove libupnp + pthreads, audio: patch portaudio
layer for WASAPI
Change-Id: I86400ac2d3a198050fc5fe3ebaf560d56b90f5ed
---
MSVC/config.h | 2 +-
MSVC/ring-daemon.vcxproj | 2 +-
src/media/audio/portaudio/portaudiolayer.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MSVC/config.h b/MSVC/config.h
index 7b7f9b4a92..70f6085abf 100644
--- a/MSVC/config.h
+++ b/MSVC/config.h
@@ -62,7 +62,7 @@ systems. This function is required for `alloca.c' support on those systems.
#define HAVE_LIBINTL_H 0
/* 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 HAVE_LIMITS_H 1
diff --git a/MSVC/ring-daemon.vcxproj b/MSVC/ring-daemon.vcxproj
index 32740da4a5..19635e1b9b 100644
--- a/MSVC/ring-daemon.vcxproj
+++ b/MSVC/ring-daemon.vcxproj
@@ -442,7 +442,7 @@
</Command>
</PreBuildEvent>
<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>
<AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
diff --git a/src/media/audio/portaudio/portaudiolayer.cpp b/src/media/audio/portaudio/portaudiolayer.cpp
index 3d9ff0e48c..98190f8b34 100644
--- a/src/media/audio/portaudio/portaudiolayer.cpp
+++ b/src/media/audio/portaudio/portaudiolayer.cpp
@@ -354,7 +354,7 @@ PortAudioLayer::init()
#ifdef WIN32_NATIVE
indexRing_ = indexOut_ = Pa_GetDefaultOutputDevice();
- indexIn_ = indexIn_ == Pa_GetDefaultInputDevice();
+ indexIn_ = Pa_GetDefaultInputDevice();
#else
indexRing_ = indexOut_ = indexOut_ == paNoDevice ? Pa_GetDefaultOutputDevice() : indexOut_;
indexIn_ = indexIn_ == paNoDevice ? Pa_GetDefaultInputDevice() : indexIn_;
--
GitLab