Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
e9805213
Commit
e9805213
authored
Dec 04, 2017
by
Ronan
Browse files
fix(conference): replace getNbParticipants to participantCount
parent
2c33faac
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
12 additions
and
12 deletions
+12
-12
src/c-wrapper/api/c-chat-room.cpp
src/c-wrapper/api/c-chat-room.cpp
+1
-1
src/chat/chat-room/basic-chat-room.cpp
src/chat/chat-room/basic-chat-room.cpp
+1
-1
src/chat/chat-room/basic-chat-room.h
src/chat/chat-room/basic-chat-room.h
+1
-1
src/chat/chat-room/client-group-chat-room.cpp
src/chat/chat-room/client-group-chat-room.cpp
+2
-2
src/chat/chat-room/client-group-chat-room.h
src/chat/chat-room/client-group-chat-room.h
+1
-1
src/chat/chat-room/server-group-chat-room-stub.cpp
src/chat/chat-room/server-group-chat-room-stub.cpp
+1
-1
src/chat/chat-room/server-group-chat-room.h
src/chat/chat-room/server-group-chat-room.h
+1
-1
src/conference/conference-interface.h
src/conference/conference-interface.h
+1
-1
src/conference/conference.cpp
src/conference/conference.cpp
+1
-1
src/conference/conference.h
src/conference/conference.h
+1
-1
src/core/core-chat-room.cpp
src/core/core-chat-room.cpp
+1
-1
No files found.
src/c-wrapper/api/c-chat-room.cpp
View file @
e9805213
...
...
@@ -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
)
->
get
Nb
Participant
s
();
return
L_GET_CPP_PTR_FROM_C_OBJECT
(
cr
)
->
getParticipant
Count
();
}
bctbx_list_t
*
linphone_chat_room_get_participants
(
const
LinphoneChatRoom
*
cr
)
{
...
...
src/chat/chat-room/basic-chat-room.cpp
View file @
e9805213
...
...
@@ -90,7 +90,7 @@ shared_ptr<Participant> BasicChatRoom::getMe () const {
return
nullptr
;
}
int
BasicChatRoom
::
get
Nb
Participant
s
()
const
{
int
BasicChatRoom
::
getParticipant
Count
()
const
{
return
1
;
}
...
...
src/chat/chat-room/basic-chat-room.h
View file @
e9805213
...
...
@@ -48,7 +48,7 @@ public:
std
::
shared_ptr
<
Participant
>
findParticipant
(
const
IdentityAddress
&
addr
)
const
override
;
std
::
shared_ptr
<
Participant
>
getMe
()
const
override
;
int
get
Nb
Participant
s
()
const
override
;
int
getParticipant
Count
()
const
override
;
const
std
::
list
<
std
::
shared_ptr
<
Participant
>>
&
getParticipants
()
const
override
;
void
setParticipantAdminStatus
(
std
::
shared_ptr
<
Participant
>
&
participant
,
bool
isAdmin
)
override
;
...
...
src/chat/chat-room/client-group-chat-room.cpp
View file @
e9805213
...
...
@@ -204,8 +204,8 @@ shared_ptr<Participant> ClientGroupChatRoom::getMe () const {
return
RemoteConference
::
getMe
();
}
int
ClientGroupChatRoom
::
get
Nb
Participant
s
()
const
{
return
RemoteConference
::
get
Nb
Participant
s
();
int
ClientGroupChatRoom
::
getParticipant
Count
()
const
{
return
RemoteConference
::
getParticipant
Count
();
}
const
list
<
shared_ptr
<
Participant
>>
&
ClientGroupChatRoom
::
getParticipants
()
const
{
...
...
src/chat/chat-room/client-group-chat-room.h
View file @
e9805213
...
...
@@ -66,7 +66,7 @@ public:
std
::
shared_ptr
<
Participant
>
findParticipant
(
const
IdentityAddress
&
addr
)
const
override
;
std
::
shared_ptr
<
Participant
>
getMe
()
const
override
;
int
get
Nb
Participant
s
()
const
override
;
int
getParticipant
Count
()
const
override
;
const
std
::
list
<
std
::
shared_ptr
<
Participant
>>
&
getParticipants
()
const
override
;
void
setParticipantAdminStatus
(
std
::
shared_ptr
<
Participant
>
&
participant
,
bool
isAdmin
)
override
;
...
...
src/chat/chat-room/server-group-chat-room-stub.cpp
View file @
e9805213
...
...
@@ -122,7 +122,7 @@ shared_ptr<Participant> ServerGroupChatRoom::getMe () const {
return
nullptr
;
}
int
ServerGroupChatRoom
::
get
Nb
Participant
s
()
const
{
int
ServerGroupChatRoom
::
getParticipant
Count
()
const
{
return
0
;
}
...
...
src/chat/chat-room/server-group-chat-room.h
View file @
e9805213
...
...
@@ -64,7 +64,7 @@ public:
std
::
shared_ptr
<
Participant
>
findParticipant
(
const
IdentityAddress
&
addr
)
const
override
;
std
::
shared_ptr
<
Participant
>
getMe
()
const
override
;
int
get
Nb
Participant
s
()
const
override
;
int
getParticipant
Count
()
const
override
;
const
std
::
list
<
std
::
shared_ptr
<
Participant
>>
&
getParticipants
()
const
override
;
void
setParticipantAdminStatus
(
std
::
shared_ptr
<
Participant
>
&
participant
,
bool
isAdmin
)
override
;
...
...
src/conference/conference-interface.h
View file @
e9805213
...
...
@@ -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
get
Nb
Participant
s
()
const
=
0
;
virtual
int
getParticipant
Count
()
const
=
0
;
virtual
const
std
::
list
<
std
::
shared_ptr
<
Participant
>>
&
getParticipants
()
const
=
0
;
virtual
const
std
::
string
&
getSubject
()
const
=
0
;
virtual
void
join
()
=
0
;
...
...
src/conference/conference.cpp
View file @
e9805213
...
...
@@ -83,7 +83,7 @@ shared_ptr<Participant> Conference::getMe () const {
return
d
->
me
;
}
int
Conference
::
get
Nb
Participant
s
()
const
{
int
Conference
::
getParticipant
Count
()
const
{
L_D
();
return
static_cast
<
int
>
(
d
->
participants
.
size
());
}
...
...
src/conference/conference.h
View file @
e9805213
...
...
@@ -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
get
Nb
Participant
s
()
const
override
;
int
getParticipant
Count
()
const
override
;
const
std
::
list
<
std
::
shared_ptr
<
Participant
>>
&
getParticipants
()
const
override
;
const
std
::
string
&
getSubject
()
const
override
;
void
join
()
override
;
...
...
src/core/core-chat-room.cpp
View file @
e9805213
...
...
@@ -135,7 +135,7 @@ shared_ptr<ChatRoom> Core::findOneToOneChatRoom (
L_D
();
for
(
const
auto
&
chatRoom
:
d
->
chatRooms
)
{
if
(
chatRoom
->
get
Nb
Participant
s
()
==
1
&&
chatRoom
->
getParticipant
Count
()
==
1
&&
chatRoom
->
getLocalAddress
()
==
localAddress
&&
participantAddress
==
chatRoom
->
getParticipants
().
front
()
->
getAddress
()
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment