diff --git a/CMakeLists.txt b/CMakeLists.txt index 69be3d8d8..3d51441bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,7 +255,6 @@ if(MSVC) include_directories(${MSVC_INCLUDE_DIR}) endif() -add_definitions("-DLINPHONE_EXPORTS") set(LINPHONE_CPPFLAGS ${BELCARD_CPPFLAGS} ${BELLESIP_CPPFLAGS} ${MEDIASTREAMER2_CPPFLAGS} ${BCTOOLBOX_CPPFLAGS} ${BELR_CPPFLAGS}) if(ENABLE_STATIC) list(APPEND LINPHONE_CPPFLAGS "-DLINPHONE_STATIC") diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt index 7e46275bf..be6515224 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -97,6 +97,7 @@ set(LINPHONE_SOURCE_FILES_CXX conference.cc tester_utils.cpp ) + if(ENABLE_JAVA_WRAPPER) list(APPEND LINPHONE_SOURCE_FILES_CXX ${LINPHONE_JNI_SOURCES}) set_source_files_properties(${LINPHONE_JNI_SOURCES} PROPERTIES GENERATED TRUE) @@ -140,8 +141,8 @@ bc_git_version(liblinphone ${PROJECT_VERSION}) add_definitions( -DUSE_BELLESIP - -DLIBLINPHONE_EXPORTS -DBCTBX_LOG_DOMAIN="liblinphone" + -DLINPHONE_EXPORTS ) set_source_files_properties(${LINPHONE_SOURCE_FILES_C} PROPERTIES LANGUAGE CXX) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index dd8a48c7d..d8391582c 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -19,9 +19,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "linphone/api/c-content.h" +#include "linphone/core_utils.h" #include "linphone/core.h" -#include "linphone/lpconfig.h" #include "linphone/logging.h" +#include "linphone/lpconfig.h" #include "linphone/sipsetup.h" #include "private.h" @@ -1287,7 +1288,7 @@ static void certificates_config_read(LinphoneCore *lc) { else rootca = NULL; } - + if (rootca) linphone_core_set_root_ca(lc,rootca); /*else use default value from belle-sip*/ diff --git a/coreapi/private_functions.h b/coreapi/private_functions.h index 63c392966..36e128b90 100644 --- a/coreapi/private_functions.h +++ b/coreapi/private_functions.h @@ -54,17 +54,28 @@ void linphone_call_notify_next_video_frame_decoded(LinphoneCall *call); LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, const LinphoneAddress *from, const LinphoneAddress *to, const LinphoneCallParams *params, LinphoneProxyConfig *cfg); LinphoneCall * linphone_call_new_incoming(struct _LinphoneCore *lc, const LinphoneAddress *from, const LinphoneAddress *to, LinphonePrivate::SalCallOp *op); -LinphoneCallLog * linphone_call_log_new(LinphoneCallDir dir, LinphoneAddress *from, LinphoneAddress * to); +LINPHONE_PUBLIC LinphoneCallLog *linphone_call_log_new(LinphoneCallDir dir, LinphoneAddress *from, LinphoneAddress * to); LinphonePlayer *linphone_call_build_player(LinphoneCall*call); LinphonePrivate::SalCallOp *linphone_call_get_op(const LinphoneCall *call); -LinphoneProxyConfig * linphone_call_get_dest_proxy(const LinphoneCall *call); + +// FIXME: Remove this declaration, use LINPHONE_PUBLIC as ugly workaround, already defined in tester_utils.h +LINPHONE_PUBLIC LinphoneProxyConfig *linphone_call_get_dest_proxy(const LinphoneCall *call); + LINPHONE_PUBLIC MediaStream * linphone_call_get_stream(LinphoneCall *call, LinphoneStreamType type); -LinphoneCallLog * linphone_call_get_log(const LinphoneCall *call); -IceSession * linphone_call_get_ice_session(const LinphoneCall *call); + +// FIXME: Remove this declaration, use LINPHONE_PUBLIC as ugly workaround, already defined in tester_utils.h +LINPHONE_PUBLIC LinphoneCallLog * linphone_call_get_log(const LinphoneCall *call); + +// FIXME: Remove this declaration, use LINPHONE_PUBLIC as ugly workaround, already defined in tester_utils.h +LINPHONE_PUBLIC IceSession *linphone_call_get_ice_session(const LinphoneCall *call); + bool_t linphone_call_get_audio_muted(const LinphoneCall *call); void linphone_call_set_audio_muted(LinphoneCall *call, bool_t value); -bool_t linphone_call_get_all_muted(const LinphoneCall *call); + +// FIXME: Remove this declaration, use LINPHONE_PUBLIC as ugly workaround, already defined in tester_utils.h +LINPHONE_PUBLIC bool_t linphone_call_get_all_muted(const LinphoneCall *call); + void _linphone_call_set_conf_ref (LinphoneCall *call, LinphoneConference *ref); MSAudioEndpoint *_linphone_call_get_endpoint (const LinphoneCall *call); void _linphone_call_set_endpoint (LinphoneCall *call, MSAudioEndpoint *endpoint); @@ -95,7 +106,10 @@ SalCustomSdpAttribute * linphone_call_params_get_custom_sdp_attributes(const Lin SalCustomSdpAttribute * linphone_call_params_get_custom_sdp_media_attributes(const LinphoneCallParams *params, LinphoneStreamType type); LinphoneCall * linphone_call_params_get_referer(const LinphoneCallParams *params); void linphone_call_params_set_referer(LinphoneCallParams *params, LinphoneCall *referer); -bool_t linphone_call_params_get_update_call_when_ice_completed(const LinphoneCallParams *params); + +// FIXME: Remove this declaration, use LINPHONE_PUBLIC as ugly workaround, already defined in tester_utils.h +LINPHONE_PUBLIC bool_t linphone_call_params_get_update_call_when_ice_completed(const LinphoneCallParams *params); + void linphone_call_params_set_update_call_when_ice_completed(LinphoneCallParams *params, bool_t value); void linphone_call_params_set_sent_vsize(LinphoneCallParams *params, MSVideoSize vsize); void linphone_call_params_set_recv_vsize(LinphoneCallParams *params, MSVideoSize vsize); @@ -107,7 +121,9 @@ void linphone_call_params_set_used_audio_codec(LinphoneCallParams *params, OrtpP void linphone_call_params_set_used_video_codec(LinphoneCallParams *params, OrtpPayloadType *codec); void linphone_call_params_set_used_text_codec(LinphoneCallParams *params, OrtpPayloadType *codec); bool_t linphone_call_params_get_no_user_consent(const LinphoneCallParams *params); -void linphone_call_params_set_no_user_consent(LinphoneCallParams *params, bool_t value); + +// FIXME: Remove this declaration, use LINPHONE_PUBLIC as ugly workaround, already defined in tester_utils.h +LINPHONE_PUBLIC void linphone_call_params_set_no_user_consent(LinphoneCallParams *params, bool_t value); void linphone_auth_info_write_config(LinphoneConfig *config, LinphoneAuthInfo *obj, int pos); LinphoneAuthInfo * linphone_auth_info_new_from_config_file(LpConfig *config, int pos); @@ -222,7 +238,10 @@ void _linphone_call_stats_set_type (LinphoneCallStats *stats, LinphoneStreamType void _linphone_call_stats_set_received_rtcp (LinphoneCallStats *stats, mblk_t *m); mblk_t *_linphone_call_stats_get_sent_rtcp (const LinphoneCallStats *stats); void _linphone_call_stats_set_sent_rtcp (LinphoneCallStats *stats, mblk_t *m); -int _linphone_call_stats_get_updated (const LinphoneCallStats *stats); + +// FIXME: Remove this declaration, use LINPHONE_PUBLIC as ugly workaround, already defined in tester_utils.h +LINPHONE_PUBLIC int _linphone_call_stats_get_updated (const LinphoneCallStats *stats); + void _linphone_call_stats_set_updated (LinphoneCallStats *stats, int updated); void _linphone_call_stats_set_rtp_stats (LinphoneCallStats *stats, const rtp_stats_t *rtpStats); void _linphone_call_stats_set_download_bandwidth (LinphoneCallStats *stats, float bandwidth); @@ -230,7 +249,10 @@ void _linphone_call_stats_set_upload_bandwidth (LinphoneCallStats *stats, float void _linphone_call_stats_set_rtcp_download_bandwidth (LinphoneCallStats *stats, float bandwidth); void _linphone_call_stats_set_rtcp_upload_bandwidth (LinphoneCallStats *stats, float bandwidth); void _linphone_call_stats_set_ip_family_of_remote (LinphoneCallStats *stats, LinphoneAddressFamily family); -bool_t _linphone_call_stats_rtcp_received_via_mux (const LinphoneCallStats *stats); + +// FIXME: Remove this declaration, use LINPHONE_PUBLIC as ugly workaround, already defined in tester_utils.h +LINPHONE_PUBLIC bool_t _linphone_call_stats_rtcp_received_via_mux (const LinphoneCallStats *stats); + bool_t linphone_core_media_description_contains_video_stream(const SalMediaDescription *md); void linphone_core_send_initial_subscribes(LinphoneCore *lc); @@ -325,7 +347,8 @@ LinphoneTunnel *linphone_core_tunnel_new(LinphoneCore *lc); void linphone_tunnel_configure(LinphoneTunnel *tunnel); void linphone_tunnel_enable_logs_with_handler(LinphoneTunnel *tunnel, bool_t enabled, OrtpLogFunc logHandler); -int linphone_core_get_calls_nb(const LinphoneCore *lc); +// FIXME: Remove this declaration, use LINPHONE_PUBLIC as ugly workaround, already defined in tester_utils.h +LINPHONE_PUBLIC int linphone_core_get_calls_nb(const LinphoneCore *lc); void linphone_core_set_state(LinphoneCore *lc, LinphoneGlobalState gstate, const char *message); void linphone_call_update_biggest_desc(LinphoneCall *call, SalMediaDescription *md); diff --git a/include/linphone/utils/utils.h b/include/linphone/utils/utils.h index c93058006..c39d64e72 100644 --- a/include/linphone/utils/utils.h +++ b/include/linphone/utils/utils.h @@ -35,32 +35,32 @@ LINPHONE_BEGIN_NAMESPACE namespace Utils { template - LINPHONE_PUBLIC constexpr T *getPtr (std::shared_ptr &object) { + constexpr T *getPtr (std::shared_ptr &object) { return object.get(); } template - LINPHONE_PUBLIC constexpr T *getPtr (const std::shared_ptr &object) { + constexpr T *getPtr (const std::shared_ptr &object) { return object.get(); } template - LINPHONE_PUBLIC constexpr T *getPtr (std::unique_ptr &object) { + constexpr T *getPtr (std::unique_ptr &object) { return object.get(); } template - LINPHONE_PUBLIC constexpr T *getPtr (const std::unique_ptr &object) { + constexpr T *getPtr (const std::unique_ptr &object) { return object.get(); } template - LINPHONE_PUBLIC constexpr T *getPtr (T *object) { + constexpr T *getPtr (T *object) { return object; } template - LINPHONE_PUBLIC constexpr T *getPtr (T &object) { + constexpr T *getPtr (T &object) { return &object; } @@ -108,7 +108,7 @@ namespace Utils { } template - LINPHONE_PUBLIC std::string join (const std::vector& elems, const S& delim) { + inline std::string join (const std::vector& elems, const S& delim) { std::stringstream ss; auto e = elems.begin(); ss << *e++; @@ -119,7 +119,7 @@ namespace Utils { LINPHONE_PUBLIC std::string trim (const std::string &str); template - LINPHONE_PUBLIC const T &getEmptyConstRefObject () { + inline const T &getEmptyConstRefObject () { static const T object{}; return object; } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 49cfb5db9..0d86d5132 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -372,7 +372,7 @@ set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${SOCI_INCLUDE_DIRS} ${SOCI_MYSQL_INCLUDES} ) -set(LINPHONE_CXX_OBJECTS_DEFINITIONS "-DLIBLINPHONE_EXPORTS") +set(LINPHONE_CXX_OBJECTS_DEFINITIONS "-DLINPHONE_EXPORTS") set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS}) set(LINPHONE_PRIVATE_HEADER_FILES)