diff --git a/src/c-wrapper/api/c-chat-room.cpp b/src/c-wrapper/api/c-chat-room.cpp index 5e3c9768e..18f996048 100644 --- a/src/c-wrapper/api/c-chat-room.cpp +++ b/src/c-wrapper/api/c-chat-room.cpp @@ -18,6 +18,7 @@ */ #include +#include // TODO: Remove me later. #include "linphone/chat.h" diff --git a/src/c-wrapper/api/c-magic-search.cpp b/src/c-wrapper/api/c-magic-search.cpp index cfdafb1b1..cceae6be7 100644 --- a/src/c-wrapper/api/c-magic-search.cpp +++ b/src/c-wrapper/api/c-magic-search.cpp @@ -78,7 +78,7 @@ bool_t linphone_magic_search_get_use_delimiter (LinphoneMagicSearch *magic_searc } void linphone_magic_search_set_use_delimiter (LinphoneMagicSearch *magic_search, bool_t enable) { - L_GET_CPP_PTR_FROM_C_OBJECT(magic_search)->setUseDelimiter(enable); + L_GET_CPP_PTR_FROM_C_OBJECT(magic_search)->setUseDelimiter(!!enable); } unsigned int linphone_magic_search_get_search_limit (const LinphoneMagicSearch *magic_search) { @@ -94,7 +94,7 @@ bool_t linphone_magic_search_get_limited_search (const LinphoneMagicSearch *magi } void linphone_magic_search_set_limited_search (LinphoneMagicSearch *magic_search, bool_t limited) { - L_GET_CPP_PTR_FROM_C_OBJECT(magic_search)->setLimitedSearch(limited); + L_GET_CPP_PTR_FROM_C_OBJECT(magic_search)->setLimitedSearch(!!limited); } void linphone_magic_search_reset_search_cache (LinphoneMagicSearch *magic_search) { diff --git a/src/call/call.cpp b/src/call/call.cpp index 99b5c83c9..a16d08482 100644 --- a/src/call/call.cpp +++ b/src/call/call.cpp @@ -461,7 +461,7 @@ void CallPrivate::onStopRingingIfNeeded (const shared_ptr &session) L_Q(); LinphoneCore *lc = q->getCore()->getCCore(); bool stopRinging = true; - bool ringDuringEarlyMedia = linphone_core_get_ring_during_incoming_early_media(lc); + bool ringDuringEarlyMedia = !!linphone_core_get_ring_during_incoming_early_media(lc); for (const auto &call : q->getCore()->getCalls()) { if ((call->getState() == CallSession::State::IncomingReceived) || (ringDuringEarlyMedia && call->getState() == CallSession::State::IncomingEarlyMedia)) { diff --git a/src/call/call.h b/src/call/call.h index 4cfbf9a8a..7566d9420 100644 --- a/src/call/call.h +++ b/src/call/call.h @@ -34,7 +34,7 @@ class CallPrivate; class CallSessionPrivate; class MediaSessionPrivate; -class Call : public Object, public CoreAccessor { +class LINPHONE_PUBLIC Call : public Object, public CoreAccessor { friend class CallSessionPrivate; friend class ChatMessage; friend class ChatMessagePrivate; diff --git a/src/chat/modifier/file-transfer-chat-message-modifier.cpp b/src/chat/modifier/file-transfer-chat-message-modifier.cpp index 61d860814..c3001231a 100644 --- a/src/chat/modifier/file-transfer-chat-message-modifier.cpp +++ b/src/chat/modifier/file-transfer-chat-message-modifier.cpp @@ -248,7 +248,7 @@ void FileTransferChatMessageModifier::processResponseFromPostFile (const belle_h LinphoneImEncryptionEngineCbsIsEncryptionEnabledForFileTransferCb is_encryption_enabled_for_file_transfer_cb = linphone_im_encryption_engine_cbs_get_is_encryption_enabled_for_file_transfer(imee_cbs); if (is_encryption_enabled_for_file_transfer_cb) { - is_file_encryption_enabled = is_encryption_enabled_for_file_transfer_cb(imee, L_GET_C_BACK_PTR(message->getChatRoom())); + is_file_encryption_enabled = !!is_encryption_enabled_for_file_transfer_cb(imee, L_GET_C_BACK_PTR(message->getChatRoom())); } } diff --git a/src/conference/handlers/local-conference-list-event-handler.cpp b/src/conference/handlers/local-conference-list-event-handler.cpp index ddc441877..af0d6d9dd 100644 --- a/src/conference/handlers/local-conference-list-event-handler.cpp +++ b/src/conference/handlers/local-conference-list-event-handler.cpp @@ -124,7 +124,7 @@ void LocalConferenceListEventHandler::subscribeReceived (LinphoneEvent *lev, con device->setConferenceSubscribeEvent((subscriptionState == LinphoneSubscriptionIncomingReceived) ? lev : nullptr); int notifyId = (notifyIdStr.empty() || device->getState() == ParticipantDevice::State::Joining) ? 0 : Utils::stoi(notifyIdStr); - string notifyBody = handler->getNotifyForId(notifyId, (chatRoom->getCapabilities() & AbstractChatRoom::Capabilities::OneToOne)); + string notifyBody = handler->getNotifyForId(notifyId, !!(chatRoom->getCapabilities() & AbstractChatRoom::Capabilities::OneToOne)); if (notifyBody.empty()) continue; diff --git a/src/conference/session/media-session.cpp b/src/conference/session/media-session.cpp index 9f94780db..c0d1741d8 100644 --- a/src/conference/session/media-session.cpp +++ b/src/conference/session/media-session.cpp @@ -2865,7 +2865,7 @@ void MediaSessionPrivate::startTextStream () { configureRtpSessionForRtcpFb(tstream); configureRtpSessionForRtcpXr(SalText); rtp_session_enable_rtcp_mux(textStream->ms.sessions.rtp_session, tstream->rtcp_mux); - bool isMulticast = ms_is_multicast(rtpAddr); + bool isMulticast = !!ms_is_multicast(rtpAddr); if (isMulticast) rtp_session_set_multicast_ttl(textStream->ms.sessions.rtp_session, tstream->ttl); text_stream_start(textStream, textProfile, rtpAddr, tstream->rtp_port, rtcpAddr, diff --git a/src/core/core-call.cpp b/src/core/core-call.cpp index a5e9e2eb2..119db552b 100644 --- a/src/core/core-call.cpp +++ b/src/core/core-call.cpp @@ -304,9 +304,8 @@ void Core::soundcardHintCheck () { LinphoneConference *conf_ctx = getCCore()->conf_ctx; if (conf_ctx && linphone_conference_get_size(conf_ctx) >= 1) return; - bool useFiles = L_GET_C_BACK_PTR(getSharedFromThis())->use_files; if ((!d->hasCalls() || noNeedForSound) - && (!useFiles && (!useRtpIo || (useRtpIo && useRtpIoEnableLocalOutput)))) { + && (!L_GET_C_BACK_PTR(getSharedFromThis())->use_files && (!useRtpIo || (useRtpIo && useRtpIoEnableLocalOutput)))) { lInfo() << "Notifying soundcard that we don't need it anymore for calls"; d->notifySoundcardUsage(false); } diff --git a/src/core/core-chat-room.cpp b/src/core/core-chat-room.cpp index 8e5a2bbae..c4282c6b6 100644 --- a/src/core/core-chat-room.cpp +++ b/src/core/core-chat-room.cpp @@ -18,6 +18,7 @@ */ #include +#include #include "address/identity-address.h" #include "chat/chat-room/basic-chat-room.h"