mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-23 07:58:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(ClientGroupChatRoom): avoid usage of make_shared on Object!

Browse source
This commit is contained in:
Ronan Abhamon 2017-10-03 13:40:17 +02:00
parent ef62012c6e
commit f3206e9f79
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/chat/client-group-chat-room.cpp
View file

@ -39,14 +39,14 @@ ClientGroupChatRoomPrivate::ClientGroupChatRoomPrivate (LinphoneCore *core)
ClientGroupChatRoom::ClientGroupChatRoom (LinphoneCore *core, const Address &me, const string &subject) ClientGroupChatRoom::ClientGroupChatRoom (LinphoneCore *core, const Address &me, const string &subject)
: ChatRoom(*new ClientGroupChatRoomPrivate(core)), RemoteConference(core, me, nullptr) { : ChatRoom(*new ClientGroupChatRoomPrivate(core)), RemoteConference(core, me, nullptr) {
string factoryUri = linphone_core_get_conference_factory_uri(core); string factoryUri = linphone_core_get_conference_factory_uri(core);
focus = make_shared<Participant>(factoryUri); focus = ObjectFactory::create<Participant>(factoryUri);
this->subject = subject; this->subject = subject;
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
shared_ptr<Participant> ClientGroupChatRoom::addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) { shared_ptr<Participant> ClientGroupChatRoom::addParticipant (const Address &addr, const CallSessionParams *params, bool hasMedia) {
activeParticipant = make_shared<Participant>(addr); activeParticipant = ObjectFactory::create<Participant>(addr);
activeParticipant->getPrivate()->createSession(*this, params, hasMedia, this); activeParticipant->getPrivate()->createSession(*this, params, hasMedia, this);
return activeParticipant; return activeParticipant;
} }
@ -143,7 +143,7 @@ void ClientGroupChatRoom::onParticipantAdded (const Address &addr) {
lWarning() << "Participant " << participant << " added but already in the list of participants!"; lWarning() << "Participant " << participant << " added but already in the list of participants!";
return; return;
} }
participant = make_shared<Participant>(addr); participant = ObjectFactory::create<Participant>(addr);
participants.push_back(participant); participants.push_back(participant);
LinphoneChatRoom *cr = L_GET_C_BACK_PTR(this); LinphoneChatRoom *cr = L_GET_C_BACK_PTR(this);
LinphoneChatRoomCbs *cbs = linphone_chat_room_get_callbacks(cr); LinphoneChatRoomCbs *cbs = linphone_chat_room_get_callbacks(cr);