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
31d39a79
Commit
31d39a79
authored
Aug 27, 2015
by
Guillaume Roguez
Browse files
Options
Downloads
Patches
Plain Diff
build: fix some build warnings
Issue: #79703 Change-Id: I403df97717df718b8931a0ecbf9f2b69053d5eb0
parent
461a906b
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/iax/iaxcall.h
+1
-1
1 addition, 1 deletion
src/iax/iaxcall.h
src/manager.cpp
+2
-1
2 additions, 1 deletion
src/manager.cpp
src/ringdht/ringaccount.cpp
+3
-3
3 additions, 3 deletions
src/ringdht/ringaccount.cpp
src/sip/sipaccount.cpp
+3
-2
3 additions, 2 deletions
src/sip/sipaccount.cpp
with
9 additions
and
7 deletions
src/iax/iaxcall.h
+
1
−
1
View file @
31d39a79
...
@@ -136,7 +136,7 @@ class IAXCall : public Call
...
@@ -136,7 +136,7 @@ class IAXCall : public Call
bool
offhold
();
bool
offhold
();
//TODO: implement mute for IAX
//TODO: implement mute for IAX
void
muteMedia
(
const
std
::
string
&
mediaType
,
bool
isMuted
)
{}
void
muteMedia
(
const
std
::
string
&
/*
mediaType
*/
,
bool
/*
isMuted
*/
)
{}
//TODO: implement restartMedia for IAX
//TODO: implement restartMedia for IAX
void
restartMediaSender
()
override
{}
void
restartMediaSender
()
override
{}
...
...
This diff is collapsed.
Click to expand it.
src/manager.cpp
+
2
−
1
View file @
31d39a79
...
@@ -618,7 +618,8 @@ Manager::onHoldCall(const std::string& callId)
...
@@ -618,7 +618,8 @@ Manager::onHoldCall(const std::string& callId)
if
(
auto
call
=
getCallFromCallID
(
callId
))
{
if
(
auto
call
=
getCallFromCallID
(
callId
))
{
try
{
try
{
if
(
result
=
call
->
onhold
())
result
=
call
->
onhold
();
if
(
result
)
removeAudio
(
*
call
);
// Unbind calls in main buffer
removeAudio
(
*
call
);
// Unbind calls in main buffer
}
catch
(
const
VoipLinkException
&
e
)
{
}
catch
(
const
VoipLinkException
&
e
)
{
RING_ERR
(
"%s"
,
e
.
what
());
RING_ERR
(
"%s"
,
e
.
what
());
...
...
This diff is collapsed.
Click to expand it.
src/ringdht/ringaccount.cpp
+
3
−
3
View file @
31d39a79
...
@@ -199,17 +199,17 @@ RingAccount::newOutgoingCall(const std::string& toUrl)
...
@@ -199,17 +199,17 @@ RingAccount::newOutgoingCall(const std::string& toUrl)
auto
call
=
weak_call
.
lock
();
auto
call
=
weak_call
.
lock
();
if
(
not
call
)
if
(
not
call
)
return
false
;
return
;
/* First step: wait for an initialized ICE transport for SIP channel */
/* First step: wait for an initialized ICE transport for SIP channel */
if
(
ice
->
isFailed
()
or
std
::
chrono
::
steady_clock
::
now
()
>=
iceInitTimeout
)
{
if
(
ice
->
isFailed
()
or
std
::
chrono
::
steady_clock
::
now
()
>=
iceInitTimeout
)
{
RING_DBG
(
"ice init failed (or timeout)"
);
RING_DBG
(
"ice init failed (or timeout)"
);
call
->
onFailure
();
call
->
onFailure
();
return
false
;
return
;
}
}
if
(
not
ice
->
isInitialized
())
if
(
not
ice
->
isInitialized
())
return
true
;
return
;
/* Next step: sent the ICE data to peer through DHT */
/* Next step: sent the ICE data to peer through DHT */
const
dht
::
Value
::
Id
callvid
=
udist
(
shared_this
->
rand_
);
const
dht
::
Value
::
Id
callvid
=
udist
(
shared_this
->
rand_
);
...
...
This diff is collapsed.
Click to expand it.
src/sip/sipaccount.cpp
+
3
−
2
View file @
31d39a79
...
@@ -1425,7 +1425,7 @@ SIPAccount::getContactHeader(pjsip_transport* t)
...
@@ -1425,7 +1425,7 @@ SIPAccount::getContactHeader(pjsip_transport* t)
t
=
transport_
->
get
();
t
=
transport_
->
get
();
if
(
!
t
)
{
if
(
!
t
)
{
RING_ERR
(
"Transport not created yet"
);
RING_ERR
(
"Transport not created yet"
);
return
{};
return
{
nullptr
,
0
};
}
}
// The transport type must be specified, in our case START_OTHER refers to stun transport
// The transport type must be specified, in our case START_OTHER refers to stun transport
...
@@ -1655,7 +1655,8 @@ SIPAccount::getCredentials() const
...
@@ -1655,7 +1655,8 @@ SIPAccount::getCredentials() const
}
}
void
void
SIPAccount
::
setRegistrationState
(
RegistrationState
state
,
unsigned
details_code
,
const
std
::
string
&
detail_str
)
SIPAccount
::
setRegistrationState
(
RegistrationState
state
,
unsigned
details_code
,
const
std
::
string
&
/*detail_str*/
)
{
{
std
::
string
details_str
;
std
::
string
details_str
;
const
pj_str_t
*
description
=
pjsip_get_status_text
(
details_code
);
const
pj_str_t
*
description
=
pjsip_get_status_text
(
details_code
);
...
...
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