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
f761e8ff
Commit
f761e8ff
authored
Apr 02, 2010
by
Alexandre Savard
Browse files
[#3116] Delete SdpMedia in sdp session
parent
d9ab9f1f
Changes
2
Hide whitespace changes
Inline
Side-by-side
sflphone-common/src/sip/sdp.cpp
View file @
f761e8ff
...
...
@@ -50,7 +50,10 @@ Sdp::Sdp (pj_pool_t *pool)
_pool
=
pool
;
}
Sdp
::~
Sdp
()
{
}
Sdp
::~
Sdp
()
{
clean_session_media
();
}
void
Sdp
::
set_media_descriptor_line
(
sdpMedia
*
media
,
pjmedia_sdp_media
**
p_med
)
{
...
...
@@ -457,7 +460,20 @@ std::string Sdp::media_to_string (void)
void
Sdp
::
clean_session_media
()
{
_session_media
.
clear
();
_info
(
"SDP: Clean session media"
);
if
(
_session_media
.
size
()
>
0
)
{
std
::
vector
<
sdpMedia
*>::
iterator
iter
=
_session_media
.
begin
();
sdpMedia
*
media
;
while
(
iter
!=
_session_media
.
end
())
{
media
=
*
iter
;
delete
media
;
iter
++
;
}
_session_media
.
clear
();
}
}
void
Sdp
::
set_negotiated_sdp
(
const
pjmedia_sdp_session
*
sdp
)
...
...
@@ -518,7 +534,7 @@ AudioCodec* Sdp::get_session_media (void)
AudioCodec
*
codec
=
NULL
;
std
::
vector
<
sdpMedia
*>
media_list
;
_debug
(
"Executing sdp line %d - get_session_media
()"
,
__LINE__
);
_debug
(
"
SDP:
Executing sdp line %d - get_session_media()"
,
__LINE__
);
media_list
=
get_session_media_list
();
nb_media
=
media_list
.
size
();
...
...
sflphone-common/src/sip/sdpmedia.cpp
View file @
f761e8ff
...
...
@@ -75,10 +75,7 @@ sdpMedia::sdpMedia (std::string type, int port, std::string dir)
sdpMedia
::~
sdpMedia
()
{
int
i
;
for
(
i
=
0
;
i
<
(
int
)
_codec_list
.
size
();
i
++
)
delete
_codec_list
[
i
];
clear_codec_list
();
}
...
...
@@ -99,7 +96,6 @@ std::string sdpMedia::get_media_type_str (void)
void
sdpMedia
::
add_codec
(
AudioCodec
*
codec
)
{
_codec_list
.
push_back
(
codec
);
}
...
...
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