mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-21 13:08:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

No longer need cCore property in Core C++ object.

Browse source
This commit is contained in:
Ghislain MARY 2017-12-04 16:59:03 +01:00
parent 04e028c74f
commit 8783aca2db
4 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/chat/chat-room/chat-room.cpp
View file

@ -163,13 +163,13 @@ LinphoneReason ChatRoomPrivate::messageReceived (SalOp *op, const SalMessage *sa
if (msg->getPrivate()->getContentType() == ContentType::ImIsComposing) {
isComposingReceived(msg->getFromAddress(), msg->getPrivate()->getText());
increaseMsgCount = FALSE;
if (lp_config_get_int(cCore->config, "sip", "deliver_imdn", 0) != 1) {
if (lp_config_get_int(linphone_core_get_config(cCore), "sip", "deliver_imdn", 0) != 1) {
goto end;
}
} else if (msg->getPrivate()->getContentType() == ContentType::Imdn) {
imdnReceived(msg->getPrivate()->getText());
increaseMsgCount = FALSE;
if (lp_config_get_int(cCore->config, "sip", "deliver_imdn", 0) != 1) {
if (lp_config_get_int(linphone_core_get_config(cCore), "sip", "deliver_imdn", 0) != 1) {
goto end;
}
}

2
src/chat/chat-room/real-time-text-chat-room.cpp
View file

@ -76,7 +76,7 @@ void RealTimeTextChatRoomPrivate::realtimeTextReceived (uint32_t character, Linp
pendingMessage->getPrivate()->setState(ChatMessage::State::Delivered);
pendingMessage->getPrivate()->setDirection(ChatMessage::Direction::Incoming);
if (lp_config_get_int(cCore->config, "misc", "store_rtt_messages", 1) == 1)
if (lp_config_get_int(linphone_core_get_config(cCore), "misc", "store_rtt_messages", 1) == 1)
pendingMessage->getPrivate()->store();
chatMessageReceived(pendingMessage);

9
src/core/core-chat-room.cpp
View file

@ -145,11 +145,10 @@ shared_ptr<ChatRoom> Core::findOneToOneChatRoom (
}
shared_ptr<ChatRoom> Core::createClientGroupChatRoom (const string &subject) {
L_D();
return L_GET_CPP_PTR_FROM_C_OBJECT(
_linphone_client_group_chat_room_new(
d->cCore,
linphone_core_get_conference_factory_uri(d->cCore),
getCCore(),
linphone_core_get_conference_factory_uri(getCCore()),
L_STRING_TO_C(subject)
)
);
@ -187,9 +186,7 @@ shared_ptr<ChatRoom> Core::getOrCreateBasicChatRoom (const IdentityAddress &peer
}
shared_ptr<ChatRoom> Core::getOrCreateBasicChatRoomFromUri (const string &peerAddress, bool isRtt) {
L_D();
LinphoneAddress *address = linphone_core_interpret_url(d->cCore, L_STRING_TO_C(peerAddress));
LinphoneAddress *address = linphone_core_interpret_url(getCCore(), L_STRING_TO_C(peerAddress));
if (!address) {
lError() << "Cannot make a valid address with: `" << peerAddress << "`.";
return nullptr;

1
src/core/core-p.h
View file

@ -48,7 +48,6 @@ public:
std::shared_ptr<ChatRoom> createBasicChatRoom (const ChatRoomId &chatRoomId, bool isRtt);
std::unique_ptr<MainDb> mainDb;
LinphoneCore *cCore = nullptr;
private:
std::list<std::shared_ptr<Call>> calls;