mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-03 11:49:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(conference): replace getNbParticipants to participantCount

Browse source
This commit is contained in:
Ronan Abhamon 2017-12-04 15:49:47 +01:00
parent 2c33faac6f
commit e9805213e2
11 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/c-wrapper/api/c-chat-room.cpp
View file

@ -287,7 +287,7 @@ LinphoneParticipant *linphone_chat_room_get_me (const LinphoneChatRoom *cr) {
}
int linphone_chat_room_get_nb_participants (const LinphoneChatRoom *cr) {
return L_GET_CPP_PTR_FROM_C_OBJECT(cr)->getNbParticipants();
return L_GET_CPP_PTR_FROM_C_OBJECT(cr)->getParticipantCount();
}
bctbx_list_t *linphone_chat_room_get_participants (const LinphoneChatRoom *cr) {

2
src/chat/chat-room/basic-chat-room.cpp
View file

@ -90,7 +90,7 @@ shared_ptr<Participant> BasicChatRoom::getMe () const {
return nullptr;
}
int BasicChatRoom::getNbParticipants () const {
int BasicChatRoom::getParticipantCount () const {
return 1;
}

2
src/chat/chat-room/basic-chat-room.h
View file

@ -48,7 +48,7 @@ public:
std::shared_ptr<Participant> findParticipant (const IdentityAddress &addr) const override;
std::shared_ptr<Participant> getMe () const override;
int getNbParticipants () const override;
int getParticipantCount () const override;
const std::list<std::shared_ptr<Participant>> &getParticipants () const override;
void setParticipantAdminStatus (std::shared_ptr<Participant> &participant, bool isAdmin) override;

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

@ -204,8 +204,8 @@ shared_ptr<Participant> ClientGroupChatRoom::getMe () const {
return RemoteConference::getMe();
}
int ClientGroupChatRoom::getNbParticipants () const {
return RemoteConference::getNbParticipants();
int ClientGroupChatRoom::getParticipantCount () const {
return RemoteConference::getParticipantCount();
}
const list<shared_ptr<Participant>> &ClientGroupChatRoom::getParticipants () const {

2
src/chat/chat-room/client-group-chat-room.h
View file

@ -66,7 +66,7 @@ public:
std::shared_ptr<Participant> findParticipant (const IdentityAddress &addr) const override;
std::shared_ptr<Participant> getMe () const override;
int getNbParticipants () const override;
int getParticipantCount () const override;
const std::list<std::shared_ptr<Participant>> &getParticipants () const override;
void setParticipantAdminStatus (std::shared_ptr<Participant> &participant, bool isAdmin) override;

2
src/chat/chat-room/server-group-chat-room-stub.cpp
View file

@ -122,7 +122,7 @@ shared_ptr<Participant> ServerGroupChatRoom::getMe () const {
return nullptr;
}
int ServerGroupChatRoom::getNbParticipants () const {
int ServerGroupChatRoom::getParticipantCount () const {
return 0;
}

2
src/chat/chat-room/server-group-chat-room.h
View file

@ -64,7 +64,7 @@ public:
std::shared_ptr<Participant> findParticipant (const IdentityAddress &addr) const override;
std::shared_ptr<Participant> getMe () const override;
int getNbParticipants () const override;
int getParticipantCount () const override;
const std::list<std::shared_ptr<Participant>> &getParticipants () const override;
void setParticipantAdminStatus (std::shared_ptr<Participant> &participant, bool isAdmin) override;

2
src/conference/conference-interface.h
View file

@ -43,7 +43,7 @@ public:
virtual std::shared_ptr<Participant> findParticipant (const IdentityAddress &addr) const = 0;
virtual const IdentityAddress &getConferenceAddress () const = 0;
virtual std::shared_ptr<Participant> getMe () const = 0;
virtual int getNbParticipants () const = 0;
virtual int getParticipantCount () const = 0;
virtual const std::list<std::shared_ptr<Participant>> &getParticipants () const = 0;
virtual const std::string &getSubject () const = 0;
virtual void join () = 0;

2
src/conference/conference.cpp
View file

@ -83,7 +83,7 @@ shared_ptr<Participant> Conference::getMe () const {
return d->me;
}
int Conference::getNbParticipants () const {
int Conference::getParticipantCount () const {
L_D();
return static_cast<int>(d->participants.size());
}

2
src/conference/conference.h
View file

@ -54,7 +54,7 @@ public:
std::shared_ptr<Participant> findParticipant (const IdentityAddress &addr) const override;
const IdentityAddress &getConferenceAddress () const override;
std::shared_ptr<Participant> getMe () const override;
int getNbParticipants () const override;
int getParticipantCount () const override;
const std::list<std::shared_ptr<Participant>> &getParticipants () const override;
const std::string &getSubject () const override;
void join () override;

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

@ -135,7 +135,7 @@ shared_ptr<ChatRoom> Core::findOneToOneChatRoom (
L_D();
for (const auto &chatRoom : d->chatRooms) {
if (
chatRoom->getNbParticipants() == 1 &&
chatRoom->getParticipantCount() == 1 &&
chatRoom->getLocalAddress() == localAddress &&
participantAddress == chatRoom->getParticipants().front()->getAddress()
)