From 677faa0615f9e9db814d9570cb4437dea63e587c Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Sun, 26 Nov 2023 16:32:32 +0300 Subject: [PATCH] - rename config.h to engine_config.h to avoid possible problems with include directories order --- src/CMakeLists.txt | 1 + src/engine/audio/Audio_Interface.h | 2 +- src/engine/audio/Audio_Mixer.cpp | 2 +- src/engine/audio/Audio_Mixer.h | 2 +- src/engine/audio/Audio_Quality.cpp | 2 +- src/engine/audio/Audio_Quality.h | 2 +- src/engine/audio/Audio_Resampler.cpp | 2 +- src/engine/audio/Audio_WavFile.cpp | 2 +- src/engine/endpoint/EP_Engine.h | 2 +- src/engine/endpoint/EP_Session.h | 2 +- src/engine/{config.h => engine_config.h} | 2 +- src/engine/helper/HL_NetworkSocket.cpp | 2 +- src/engine/helper/HL_SocketHeap.cpp | 2 +- src/engine/helper/HL_SocketHeap.h | 2 +- src/engine/media/MT_AmrCodec.h | 2 +- src/engine/media/MT_AudioCodec.cpp | 2 +- src/engine/media/MT_AudioCodec.h | 2 +- src/engine/media/MT_AudioReceiver.cpp | 2 +- src/engine/media/MT_AudioStream.h | 2 +- src/engine/media/MT_CngHelper.cpp | 2 +- src/engine/media/MT_CodecList.cpp | 2 +- src/engine/media/MT_CodecList.h | 2 +- src/engine/media/MT_Dtmf.cpp | 2 +- src/engine/media/MT_Dtmf.h | 2 +- src/engine/media/MT_EvsCodec.h | 11 +++++++---- src/engine/media/MT_NativeRtpSender.h | 2 +- src/engine/media/MT_WebRtc.cpp | 2 +- 27 files changed, 33 insertions(+), 29 deletions(-) rename src/engine/{config.h => engine_config.h} (98%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index babbc4a4..bbdb8480 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -57,6 +57,7 @@ if (USE_MUSL) endif() set (RTPHONE_SOURCES + ${rtphone_engine}/engine_config.h ${rtphone_engine}/media/MT_Statistics.cpp ${rtphone_engine}/media/MT_WebRtc.cpp ${rtphone_engine}/media/MT_Stream.cpp diff --git a/src/engine/audio/Audio_Interface.h b/src/engine/audio/Audio_Interface.h index fbd00ef4..0dc11e48 100644 --- a/src/engine/audio/Audio_Interface.h +++ b/src/engine/audio/Audio_Interface.h @@ -7,7 +7,7 @@ #define __AUDIO_INTERFACE_H #include -#include "../config.h" +#include "../engine_config.h" #include "../helper/HL_Types.h" #include "../helper/HL_VariantMap.h" #include "../helper/HL_Pointer.h" diff --git a/src/engine/audio/Audio_Mixer.cpp b/src/engine/audio/Audio_Mixer.cpp index d6274206..46a437ed 100644 --- a/src/engine/audio/Audio_Mixer.cpp +++ b/src/engine/audio/Audio_Mixer.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "../config.h" +#include "../engine_config.h" #include "../helper/HL_Exception.h" #include "../helper/HL_Log.h" diff --git a/src/engine/audio/Audio_Mixer.h b/src/engine/audio/Audio_Mixer.h index a997bb9f..a43a39fb 100644 --- a/src/engine/audio/Audio_Mixer.h +++ b/src/engine/audio/Audio_Mixer.h @@ -6,7 +6,7 @@ #ifndef _RX_MIXER_H #define _RX_MIXER_H -#include "../config.h" +#include "../engine_config.h" #include "../helper/HL_ByteBuffer.h" #include "../helper/HL_Sync.h" #include "Audio_Resampler.h" diff --git a/src/engine/audio/Audio_Quality.cpp b/src/engine/audio/Audio_Quality.cpp index d4207074..5a019b4f 100644 --- a/src/engine/audio/Audio_Quality.cpp +++ b/src/engine/audio/Audio_Quality.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "../config.h" +#include "../engine_config.h" #include "Audio_Quality.h" #include "../helper/HL_Exception.h" #include "../helper/HL_Types.h" diff --git a/src/engine/audio/Audio_Quality.h b/src/engine/audio/Audio_Quality.h index 813210d9..6775a6e0 100644 --- a/src/engine/audio/Audio_Quality.h +++ b/src/engine/audio/Audio_Quality.h @@ -5,7 +5,7 @@ #ifndef __AUDIO_QUALITY_H #define __AUDIO_QUALITY_H -#include "../config.h" +#include "../engine_config.h" #include "../helper/HL_Sync.h" #include diff --git a/src/engine/audio/Audio_Resampler.cpp b/src/engine/audio/Audio_Resampler.cpp index 6794a33b..c69d933f 100644 --- a/src/engine/audio/Audio_Resampler.cpp +++ b/src/engine/audio/Audio_Resampler.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "../config.h" +#include "../engine_config.h" #include "Audio_Resampler.h" #include #include diff --git a/src/engine/audio/Audio_WavFile.cpp b/src/engine/audio/Audio_WavFile.cpp index 33e17ca0..6e4d8e54 100644 --- a/src/engine/audio/Audio_WavFile.cpp +++ b/src/engine/audio/Audio_WavFile.cpp @@ -7,7 +7,7 @@ #include "helper/HL_Exception.h" #include "helper/HL_String.h" #include "helper/HL_Log.h" -#include "../config.h" +#include "../engine_config.h" #include #include diff --git a/src/engine/endpoint/EP_Engine.h b/src/engine/endpoint/EP_Engine.h index ea2c059b..aabe5b63 100644 --- a/src/engine/endpoint/EP_Engine.h +++ b/src/engine/endpoint/EP_Engine.h @@ -47,7 +47,7 @@ #include "../ice/ICETime.h" #include #include -#include "../config.h" +#include "../engine_config.h" #include "EP_Session.h" #include "EP_Observer.h" #include "EP_DataProvider.h" diff --git a/src/engine/endpoint/EP_Session.h b/src/engine/endpoint/EP_Session.h index 492ac9da..625a3d6e 100644 --- a/src/engine/endpoint/EP_Session.h +++ b/src/engine/endpoint/EP_Session.h @@ -35,7 +35,7 @@ #include #include -#include "../config.h" +#include "../engine_config.h" #include "EP_Account.h" #include "EP_DataProvider.h" #include "EP_AudioProvider.h" diff --git a/src/engine/config.h b/src/engine/engine_config.h similarity index 98% rename from src/engine/config.h rename to src/engine/engine_config.h index 0d84f550..772a633d 100644 --- a/src/engine/config.h +++ b/src/engine/engine_config.h @@ -1,4 +1,4 @@ -/* Copyright(C) 2007-2020 VoIP objects (voipobjects.com) +/* Copyright(C) 2007-2023 VoIP objects (voipobjects.com) * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ diff --git a/src/engine/helper/HL_NetworkSocket.cpp b/src/engine/helper/HL_NetworkSocket.cpp index e1e23794..bebaca6d 100644 --- a/src/engine/helper/HL_NetworkSocket.cpp +++ b/src/engine/helper/HL_NetworkSocket.cpp @@ -7,7 +7,7 @@ # include #endif -#include "../config.h" +#include "../engine_config.h" #include "HL_NetworkSocket.h" #if defined(TARGET_OSX) || defined(TARGET_LINUX) diff --git a/src/engine/helper/HL_SocketHeap.cpp b/src/engine/helper/HL_SocketHeap.cpp index 22ef3f1d..9514881f 100644 --- a/src/engine/helper/HL_SocketHeap.cpp +++ b/src/engine/helper/HL_SocketHeap.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "../config.h" +#include "../engine_config.h" #ifdef WIN32 #include #include diff --git a/src/engine/helper/HL_SocketHeap.h b/src/engine/helper/HL_SocketHeap.h index d68182ec..f7e301e3 100644 --- a/src/engine/helper/HL_SocketHeap.h +++ b/src/engine/helper/HL_SocketHeap.h @@ -6,7 +6,7 @@ #ifndef __SOCKET_HEAP_H #define __SOCKET_HEAP_H -#include "../config.h" +#include "../engine_config.h" #include #include #include diff --git a/src/engine/media/MT_AmrCodec.h b/src/engine/media/MT_AmrCodec.h index 5b926725..dddc02a3 100644 --- a/src/engine/media/MT_AmrCodec.h +++ b/src/engine/media/MT_AmrCodec.h @@ -1,7 +1,7 @@ #ifndef MT_AMRCODEC_H #define MT_AMRCODEC_H -#include "../config.h" +#include "../engine_config.h" #include #include "MT_Codec.h" #include "../helper/HL_Pointer.h" diff --git a/src/engine/media/MT_AudioCodec.cpp b/src/engine/media/MT_AudioCodec.cpp index eef21803..a2af9122 100644 --- a/src/engine/media/MT_AudioCodec.cpp +++ b/src/engine/media/MT_AudioCodec.cpp @@ -5,7 +5,7 @@ #define NOMINMAX -#include "../config.h" +#include "../engine_config.h" #include "MT_AudioCodec.h" #include "MT_CodecList.h" #include "../helper/HL_Exception.h" diff --git a/src/engine/media/MT_AudioCodec.h b/src/engine/media/MT_AudioCodec.h index 74c26fcc..a127e8cf 100644 --- a/src/engine/media/MT_AudioCodec.h +++ b/src/engine/media/MT_AudioCodec.h @@ -6,7 +6,7 @@ #ifndef __AUDIO_CODEC_H #define __AUDIO_CODEC_H -#include "../config.h" +#include "../engine_config.h" #include #include "MT_Codec.h" #include "../audio/Audio_Resampler.h" diff --git a/src/engine/media/MT_AudioReceiver.cpp b/src/engine/media/MT_AudioReceiver.cpp index f162c53b..2c2aed8c 100644 --- a/src/engine/media/MT_AudioReceiver.cpp +++ b/src/engine/media/MT_AudioReceiver.cpp @@ -5,7 +5,7 @@ #define NOMINMAX -#include "../config.h" +#include "../engine_config.h" #include "MT_AudioReceiver.h" #include "MT_AudioCodec.h" #include "MT_CngHelper.h" diff --git a/src/engine/media/MT_AudioStream.h b/src/engine/media/MT_AudioStream.h index cb44278b..fbf35ba8 100644 --- a/src/engine/media/MT_AudioStream.h +++ b/src/engine/media/MT_AudioStream.h @@ -6,7 +6,7 @@ #ifndef __MT_AUDIOSTREAM_H #define __MT_AUDIOSTREAM_H -#include "../config.h" +#include "../engine_config.h" #include "MT_Stream.h" #include "MT_NativeRtpSender.h" #include "MT_SingleAudioStream.h" diff --git a/src/engine/media/MT_CngHelper.cpp b/src/engine/media/MT_CngHelper.cpp index e6a330a1..56f7c140 100644 --- a/src/engine/media/MT_CngHelper.cpp +++ b/src/engine/media/MT_CngHelper.cpp @@ -1,4 +1,4 @@ -#include "../config.h" +#include "../engine_config.h" #include "MT_CngHelper.h" #include diff --git a/src/engine/media/MT_CodecList.cpp b/src/engine/media/MT_CodecList.cpp index b3cb34f5..b9024751 100644 --- a/src/engine/media/MT_CodecList.cpp +++ b/src/engine/media/MT_CodecList.cpp @@ -5,7 +5,7 @@ #include #include -#include "../config.h" +#include "../engine_config.h" #include "MT_CodecList.h" #include "MT_AudioCodec.h" diff --git a/src/engine/media/MT_CodecList.h b/src/engine/media/MT_CodecList.h index 740a3fbd..9ee9e33e 100644 --- a/src/engine/media/MT_CodecList.h +++ b/src/engine/media/MT_CodecList.h @@ -6,7 +6,7 @@ #ifndef __MT_CODEC_LIST_H #define __MT_CODEC_LIST_H -#include "../config.h" +#include "../engine_config.h" #if defined(USE_RESIP_INTEGRATION) # include "resiprocate/resip/stack/SdpContents.hxx" diff --git a/src/engine/media/MT_Dtmf.cpp b/src/engine/media/MT_Dtmf.cpp index 6fee22ab..05d9be5a 100644 --- a/src/engine/media/MT_Dtmf.cpp +++ b/src/engine/media/MT_Dtmf.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "../config.h" +#include "../engine_config.h" #include "MT_Dtmf.h" diff --git a/src/engine/media/MT_Dtmf.h b/src/engine/media/MT_Dtmf.h index b8facfa1..998059e8 100644 --- a/src/engine/media/MT_Dtmf.h +++ b/src/engine/media/MT_Dtmf.h @@ -6,7 +6,7 @@ #ifndef MT_DTMF #define MT_DTMF -#include "../config.h" +#include "../engine_config.h" #include #include #include "../helper/HL_ByteBuffer.h" diff --git a/src/engine/media/MT_EvsCodec.h b/src/engine/media/MT_EvsCodec.h index eea0858b..cd1b64ea 100644 --- a/src/engine/media/MT_EvsCodec.h +++ b/src/engine/media/MT_EvsCodec.h @@ -1,5 +1,7 @@ -#pragma once +#ifndef __MT_EVS_CODEC_H +#define __MT_EVS_CODEC_H +#include "../engine_config.h" #include #include #include @@ -10,7 +12,6 @@ #include #include -#include "config.h" #include "MT_Codec.h" #include "libevs/lib_com/prot.h" @@ -40,7 +41,7 @@ public: public: EVSFactory(StreamParameters& sp); - const char* name() { return MT_EVS_CODECNAME; }; + const char* name() { return MT_EVS_CODECNAME; } int samplerate(); int payloadType(); PCodec create(); @@ -51,7 +52,7 @@ public: EVSCodec(const StreamParameters& sp); ~EVSCodec() override; - const char* name() override { return MT_EVS_CODECNAME; } ; + const char* name() override { return MT_EVS_CODECNAME; } int samplerate() override; int pcmLength() override; int frameTime() override; @@ -68,3 +69,5 @@ private: }; } // End of namespace + +#endif diff --git a/src/engine/media/MT_NativeRtpSender.h b/src/engine/media/MT_NativeRtpSender.h index e57aa3c2..46311839 100644 --- a/src/engine/media/MT_NativeRtpSender.h +++ b/src/engine/media/MT_NativeRtpSender.h @@ -6,7 +6,7 @@ #ifndef __MT_NATIVE_RTP_SENDER_H #define __MT_NATIVE_RTP_SENDER_H -#include "../config.h" +#include "../engine_config.h" #include "jrtplib/src/rtpexternaltransmitter.h" #include "srtp/include/srtp.h" #include "../helper/HL_NetworkSocket.h" diff --git a/src/engine/media/MT_WebRtc.cpp b/src/engine/media/MT_WebRtc.cpp index 965bfbe1..b14b99d2 100644 --- a/src/engine/media/MT_WebRtc.cpp +++ b/src/engine/media/MT_WebRtc.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "../config.h" +#include "../engine_config.h" #include "MT_WebRtc.h" #include "../helper/HL_Exception.h"