WASAPI sound card support is no longer a mediastreamer2 plugin.

builders/ms2plugins.cmake

@@ -38,9 +38,6 @@ endif()
 if(ENABLE_OPENH264)
 	lcb_dependencies("msopenh264")
 endif()
-if(ENABLE_WASAPI)
-	lcb_dependencies("mswasapi")
-endif()
 if(ENABLE_X264)
 	lcb_dependencies("msx264")
 endif()

builders/mswasapi.cmake

-############################################################################
-# mswasapi.cmake
-# Copyright (C) 2015  Belledonne Communications, Grenoble France
-#
-############################################################################
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-############################################################################
-
-lcb_git_repository("git://git.linphone.org/mswasapi.git")
-lcb_git_tag_latest("master")
-lcb_git_tag("1.1.0")
-lcb_external_source_paths("mswasapi")
-lcb_groupable(YES)
-lcb_plugin(YES)
-
-lcb_dependencies("ms2")

configs/config-desktop-raspberry.cmake

@@ -37,7 +37,6 @@ set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
 set(DEFAULT_VALUE_ENABLE_VCARD ON)
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
-set(DEFAULT_VALUE_ENABLE_WASAPI OFF)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 
 

configs/config-desktop.cmake

@@ -38,7 +38,6 @@ set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
 set(DEFAULT_VALUE_ENABLE_VCARD ON)
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
-set(DEFAULT_VALUE_ENABLE_WASAPI ON)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 set(DEFAULT_VALUE_ENABLE_LIME ON)
 set(DEFAULT_VALUE_ENABLE_TOOLS OFF)

configs/config-python-raspberry.cmake

@@ -30,8 +30,6 @@ set(PACKAGE_NAME "linphone4raspberry")
 
 include("configs/config-python.cmake")
 
-set(DEFAULT_VALUE_ENABLE_WASAPI OFF)
-
 # ffmpeg
 lcb_builder_cross_compilation_options(ffmpeg
 	"--prefix=${CMAKE_INSTALL_PREFIX}"

configs/config-python.cmake

@@ -34,7 +34,6 @@ set(DEFAULT_VALUE_ENABLE_SRTP ON)
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_VCARD ON)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
-set(DEFAULT_VALUE_ENABLE_WASAPI ON)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 set(DEFAULT_VALUE_ENABLE_LIME ON)
 set(DEFAULT_VALUE_ENABLE_TOOLS OFF)

configs/config-webplugin.cmake

@@ -29,7 +29,6 @@ set(DEFAULT_VALUE_ENABLE_SPEEX ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
-set(DEFAULT_VALUE_ENABLE_WASAPI ON)
 set(DEFAULT_VALUE_ENABLE_TOOLS OFF)
 
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")

configs/config-win10.cmake

@@ -37,7 +37,6 @@ set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
 set(DEFAULT_VALUE_ENABLE_VCARD ON)
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
-set(DEFAULT_VALUE_ENABLE_WASAPI ON)
 set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 set(DEFAULT_VALUE_ENABLE_LIME ON)

configs/config-windowsphone.cmake

@@ -29,7 +29,6 @@ set(DEFAULT_VALUE_ENABLE_G729 ${DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES})
 set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF)
 set(DEFAULT_VALUE_ENABLE_POLARSSL ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
-set(DEFAULT_VALUE_ENABLE_WASAPI ON)
 set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON)
 set(DEFAULT_VALUE_ENABLE_TOOLS OFF)
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")

configs/python/CMakeLists.txt

@@ -138,11 +138,6 @@ if(ENABLE_OPENH264)
 	target_compile_definitions(pylinphone PRIVATE "ENABLE_OPENH264=1")
 	target_link_libraries(pylinphone ${MSOPENH264_LIBRARY} ${OPENH264_LIBRARY})
 endif()
-if(ENABLE_WASAPI)
-	find_library(MSWASAPI_LIBRARY mswasapi HINTS "${CMAKE_INSTALL_PREFIX}/lib/mediastreamer/plugins")
-	target_compile_definitions(pylinphone PRIVATE "ENABLE_WASAPI=1")
-	target_link_libraries(pylinphone ${MSWASAPI_LIBRARY})
-endif()
 target_compile_options(pylinphone PUBLIC ${LINPHONE_CPPFLAGS})
 target_include_directories(pylinphone PUBLIC ${LINPHONE_INCLUDE_DIRS} ${XML2_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} PRIVATE "${LINPHONE_SOURCE_DIR}/coreapi" "${LINPHONE_SOURCE_DIR}/include")
 set_target_properties(pylinphone PROPERTIES LINKER_LANGUAGE CXX)

configs/python/additional_steps.cmake

@@ -37,5 +37,5 @@ ExternalProject_Add(TARGET_pylinphone
 	PATCH_COMMAND "${CMAKE_COMMAND}" "-E" "copy_directory" "${CMAKE_CURRENT_LIST_DIR}" "<SOURCE_DIR>"
 		"COMMAND" "${CMAKE_COMMAND}" "-E" "copy" "${CMAKE_CURRENT_LIST_DIR}/../../cmake/FindXML2.cmake" "<SOURCE_DIR>"
 	CMAKE_GENERATOR ${CMAKE_GENERATOR}
-	CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DPACKAGE_NAME=${PACKAGE_NAME} -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} -DLINPHONE_BUILDER_PYTHON_VERSION=${LINPHONE_BUILDER_PYTHON_VERSION} -DENABLE_FFMPEG:BOOL=${ENABLE_FFMPEG} -DENABLE_OPENH264:BOOL=${ENABLE_OPENH264} -DENABLE_WASAPI:BOOL=${ENABLE_WASAPI}
+	CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DPACKAGE_NAME=${PACKAGE_NAME} -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} -DLINPHONE_BUILDER_PYTHON_VERSION=${LINPHONE_BUILDER_PYTHON_VERSION} -DENABLE_FFMPEG:BOOL=${ENABLE_FFMPEG} -DENABLE_OPENH264:BOOL=${ENABLE_OPENH264}
 )

options/ms2.cmake

@@ -31,7 +31,6 @@ lcb_add_dependent_option("ZRTP" "ZRTP media encryption support." "${DEFAULT_VALU
 
 #audio options and codecs
 lcb_add_option("WebRTC AEC" "WebRTC echo canceller support." "${DEFAULT_VALUE_ENABLE_WEBRTC_AEC}")
-lcb_add_dependent_option("WASAPI" "Windows Audio Session API (WASAPI) sound card support." "${DEFAULT_VALUE_ENABLE_WASAPI}" "MSVC" OFF)
 lcb_add_strict_dependent_option("AMRNB" "AMR narrow-band audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
 lcb_add_strict_dependent_option("AMRWB" "AMR wide-band audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
 lcb_add_option("Codec2" "Codec2 audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_CODEC2}")