audioprocessing: fix cmake

+ Adds some missing references to the recently added files. + Removes the include of 'speex_config_types.h' on native Windows. TODO: Refactor the cmake to be in one file. Way too complicated for nothing. Also, "source_group" is probably not used by most devs. Change-Id: I020caf40544d2a7502c70d96fec99b08278ac2ff
savoirfairelinux · Aug 10, 2022 · 8105fa0 · 8105fa0
1 parent aa9a39e
commit 8105fa0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -101,7 +101,7 @@ set (Source_Files__jamidht__eth__libdevcrypto ${Source_Files__jamidht__eth__libd
 set (Source_Files__media ${Source_Files__media} PARENT_SCOPE)
 set (Source_Files__media__audio ${Source_Files__media__audio} PARENT_SCOPE)
 set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARENT_SCOPE)
-set (Source_Files__media__audio__echo_cancel ${Source_Files__media__audio__echo_cancel} PARENT_SCOPE)
+set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE)
 set (Source_Files__media__video ${Source_Files__media__video} PARENT_SCOPE)
 if(MSVC)
    if(WINDOWS_STORE)

diff --git a/src/media/CMakeLists.txt b/src/media/CMakeLists.txt
@@ -56,7 +56,7 @@ if(MSVC)
    set (Source_Files__media__audio__portaudio ${Source_Files__media__audio__portaudio} PARENT_SCOPE)
 endif()
 set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARENT_SCOPE)
-set (Source_Files__media__audio__echo_cancel ${Source_Files__media__audio__echo_cancel} PARENT_SCOPE)
+set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE)
 
 set (Source_Files__media__video ${Source_Files__media__video} PARENT_SCOPE)
 if(MSVC)

diff --git a/src/media/audio/audio-processing/speex.cpp b/src/media/audio/audio-processing/speex.cpp
@@ -19,16 +19,19 @@
 #include "speex.h"
 
 #include "audio/audiolayer.h"
-#include <cstdint>
-#include <memory>
-#include <speex/speex_config_types.h>
-#include <vector>
 
+#ifndef _MSC_VER
+#include <speex/speex_config_types.h>
+#endif
 extern "C" {
 #include <speex/speex_echo.h>
 #include <speex/speex_preprocess.h>
 }
 
+#include <cstdint>
+#include <memory>
+#include <vector>
+
 namespace jami {
 
 SpeexAudioProcessor::SpeexAudioProcessor(AudioFormat format, unsigned frameSize)