Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
2740f79a
Commit
2740f79a
authored
11 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #28351: iaxvoiplink: use range-based for loops
parent
17bf6cea
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/src/iax/iaxvoiplink.cpp
+8
-9
8 additions, 9 deletions
daemon/src/iax/iaxvoiplink.cpp
with
8 additions
and
9 deletions
daemon/src/iax/iaxvoiplink.cpp
+
8
−
9
View file @
2740f79a
...
@@ -105,8 +105,8 @@ IAXVoIPLink::terminate()
...
@@ -105,8 +105,8 @@ IAXVoIPLink::terminate()
sfl
::
ScopedLock
m
(
iaxCallMapMutex_
);
sfl
::
ScopedLock
m
(
iaxCallMapMutex_
);
for
(
IAXCallMap
::
iterator
iter
=
iaxCallMap_
.
begin
();
iter
!=
iaxCallMap_
.
end
();
++
iter
)
{
for
(
auto
&
iter
:
iaxCallMap_
)
{
IAXCall
*
call
=
static_cast
<
IAXCall
*>
(
iter
->
second
);
IAXCall
*
call
=
static_cast
<
IAXCall
*>
(
iter
.
second
);
if
(
call
)
{
if
(
call
)
{
sfl
::
ScopedLock
lock
(
mutexIAX_
);
sfl
::
ScopedLock
lock
(
mutexIAX_
);
...
@@ -182,8 +182,8 @@ IAXVoIPLink::getCallIDs()
...
@@ -182,8 +182,8 @@ IAXVoIPLink::getCallIDs()
void
void
IAXVoIPLink
::
sendAudioFromMic
()
IAXVoIPLink
::
sendAudioFromMic
()
{
{
for
(
IAXCallMap
::
const_iterator
iter
=
iaxCallMap_
.
begin
();
iter
!=
iaxCallMap_
.
end
()
;
++
iter
)
{
for
(
const
auto
&
iter
:
iaxCallMap_
)
{
IAXCall
*
currentCall
=
static_cast
<
IAXCall
*>
(
iter
->
second
);
IAXCall
*
currentCall
=
static_cast
<
IAXCall
*>
(
iter
.
second
);
if
(
!
currentCall
or
currentCall
->
getState
()
!=
Call
::
ACTIVE
)
if
(
!
currentCall
or
currentCall
->
getState
()
!=
Call
::
ACTIVE
)
continue
;
continue
;
...
@@ -460,9 +460,8 @@ IAXVoIPLink::clearIaxCallMap()
...
@@ -460,9 +460,8 @@ IAXVoIPLink::clearIaxCallMap()
{
{
sfl
::
ScopedLock
m
(
iaxCallMapMutex_
);
sfl
::
ScopedLock
m
(
iaxCallMapMutex_
);
for
(
IAXCallMap
::
const_iterator
iter
=
iaxCallMap_
.
begin
();
for
(
const
auto
&
iter
:
iaxCallMap_
)
iter
!=
iaxCallMap_
.
end
();
++
iter
)
delete
iter
.
second
;
delete
iter
->
second
;
iaxCallMap_
.
clear
();
iaxCallMap_
.
clear
();
...
@@ -540,8 +539,8 @@ IAXVoIPLink::iaxFindCallBySession(iax_session* session)
...
@@ -540,8 +539,8 @@ IAXVoIPLink::iaxFindCallBySession(iax_session* session)
{
{
sfl
::
ScopedLock
m
(
iaxCallMapMutex_
);
sfl
::
ScopedLock
m
(
iaxCallMapMutex_
);
for
(
IAXCallMap
::
const_iterator
iter
=
iaxCallMap_
.
begin
();
iter
!=
iaxCallMap_
.
end
();
++
iter
)
{
for
(
const
auto
&
iter
:
iaxCallMap_
)
{
IAXCall
*
call
=
static_cast
<
IAXCall
*>
(
iter
->
second
);
IAXCall
*
call
=
static_cast
<
IAXCall
*>
(
iter
.
second
);
if
(
call
and
call
->
session
==
session
)
if
(
call
and
call
->
session
==
session
)
return
call
;
return
call
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment