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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
b44036a6
Commit
b44036a6
authored
14 years ago
by
asavard
Browse files
Options
Downloads
Patches
Plain Diff
[#4367] Remove Redeclaration of SymetricAudioRtpSession in rtpfactory
parent
6f233d23
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-common/src/audio/audiortp/AudioRtpFactory.h
+3
-0
3 additions, 0 deletions
sflphone-common/src/audio/audiortp/AudioRtpFactory.h
sflphone-common/src/audio/audiortp/AudioRtpSession.h
+1
-1
1 addition, 1 deletion
sflphone-common/src/audio/audiortp/AudioRtpSession.h
with
4 additions
and
1 deletion
sflphone-common/src/audio/audiortp/AudioRtpFactory.h
+
3
−
0
View file @
b44036a6
...
@@ -39,18 +39,21 @@
...
@@ -39,18 +39,21 @@
class
SdesNegotiator
;
class
SdesNegotiator
;
class
SIPCall
;
class
SIPCall
;
/*
namespace sfl
namespace sfl
{
{
class AudioZrtpSession;
class AudioZrtpSession;
class AudioSrtpSession;
class AudioSrtpSession;
class AudioSymmetricRtpSession;
class AudioSymmetricRtpSession;
}
}
*/
namespace
sfl
namespace
sfl
{
{
class
AudioZrtpSession
;
class
AudioZrtpSession
;
class
AudioSrtpSession
;
class
AudioSrtpSession
;
class
AudioSymmetricRtpSession
;
// Possible kind of rtp session
// Possible kind of rtp session
typedef
enum
RtpMethod
{
typedef
enum
RtpMethod
{
...
...
This diff is collapsed.
Click to expand it.
sflphone-common/src/audio/audiortp/AudioRtpSession.h
+
1
−
1
View file @
b44036a6
...
@@ -472,7 +472,7 @@ void AudioRtpSession<D>::setSessionTimeouts (void)
...
@@ -472,7 +472,7 @@ void AudioRtpSession<D>::setSessionTimeouts (void)
static_cast
<
D
*>
(
this
)
->
setSchedulingTimeout
(
schedulingTimeout
);
static_cast
<
D
*>
(
this
)
->
setSchedulingTimeout
(
schedulingTimeout
);
static_cast
<
D
*>
(
this
)
->
setExpireTimeout
(
expireTimeout
);
static_cast
<
D
*>
(
this
)
->
setExpireTimeout
(
expireTimeout
);
}
catch
(...)
{
}
catch
(...)
{
_debugException
(
"Initialization failed while setting timeouts"
);
_debugException
(
"
AudioRtpSession:
Initialization failed while setting timeouts"
);
throw
AudioRtpSessionException
();
throw
AudioRtpSessionException
();
}
}
}
}
...
...
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