Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
6a34602c
Commit
6a34602c
authored
Jul 17, 2019
by
Adrien Béraud
Browse files
manager: cleanup
Change-Id: I8dfdbf2d406fab9f5c7a5533b0406d87bd678122
parent
93f872e5
Changes
4
Show whitespace changes
Inline
Side-by-side
src/conference.cpp
View file @
6a34602c
...
...
@@ -125,7 +125,8 @@ std::string Conference::getStateStr() const
}
}
ParticipantSet
Conference
::
getParticipantList
()
const
const
ParticipantSet
&
Conference
::
getParticipantList
()
const
{
return
participants_
;
}
...
...
src/conference.h
View file @
6a34602c
...
...
@@ -93,7 +93,7 @@ class Conference : public Recordable {
/**
* Get the participant list for this conference
*/
ParticipantSet
getParticipantList
()
const
;
const
ParticipantSet
&
getParticipantList
()
const
;
/**
* Get the display names or peer numbers for this conference
...
...
src/jamidht/jamiaccount.cpp
View file @
6a34602c
...
...
@@ -384,10 +384,10 @@ JamiAccount::newOutgoingCall(const std::string& toUrl,
startOutgoingCall
(
call
,
toUri
);
}
catch
(...)
{
#if HAVE_RINGNS
NameDirectory
::
lookupUri
(
suffix
,
nameServer_
,
[
wthis_
=
weak
(),
call
](
const
std
::
string
&
result
,
NameDirectory
::
lookupUri
(
suffix
,
nameServer_
,
[
wthis_
=
weak
(),
call
](
const
std
::
string
&
result
,
NameDirectory
::
Response
response
)
{
// we may run inside an unknown thread, but following code must be called in main thread
runOnMainThread
([
=
,
&
result
]()
{
runOnMainThread
([
wthis_
,
result
,
response
,
call
]()
{
if
(
response
!=
NameDirectory
::
Response
::
found
)
{
call
->
onFailure
(
EINVAL
);
return
;
...
...
src/manager.cpp
View file @
6a34602c
...
...
@@ -2940,16 +2940,14 @@ Manager::getDisplayNames(const std::string& confID) const
std
::
vector
<
std
::
string
>
Manager
::
getParticipantList
(
const
std
::
string
&
confID
)
const
{
std
::
vector
<
std
::
string
>
v
;
ConferenceMap
::
const_iterator
iter_conf
=
pimpl_
->
conferenceMap_
.
find
(
confID
);
auto
iter_conf
=
pimpl_
->
conferenceMap_
.
find
(
confID
);
if
(
iter_conf
!=
pimpl_
->
conferenceMap_
.
end
())
{
const
ParticipantSet
participants
(
iter_conf
->
second
->
getParticipantList
());
std
::
copy
(
participants
.
begin
(),
participants
.
end
()
,
std
::
back_inserter
(
v
));
;
const
ParticipantSet
&
participants
(
iter_conf
->
second
->
getParticipantList
());
return
{
participants
.
begin
(),
participants
.
end
()
}
;
}
else
JAMI_WARN
(
"Did not find conference %s"
,
confID
.
c_str
());
return
v
;
return
{}
;
}
std
::
string
...
...
Write
Preview
Supports
Markdown
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