From 31f0c6894db41af5a1fbaf25364c5df5ea370e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Wed, 27 Jul 2011 09:27:03 -0400
Subject: [PATCH] * #6392: Sdp: move clean functions to destructor
---
sflphone-common/src/sip/sdp.cpp | 40 +++++----------------------------
sflphone-common/src/sip/sdp.h | 2 ++
2 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/sflphone-common/src/sip/sdp.cpp b/sflphone-common/src/sip/sdp.cpp
index 771e281947..c94092c2b1 100644
--- a/sflphone-common/src/sip/sdp.cpp
+++ b/sflphone-common/src/sip/sdp.cpp
@@ -639,46 +639,18 @@ void Sdp::addZrtpAttribute (pjmedia_sdp_media* media, std::string hash)
}
}
-void Sdp::cleanSessionMedia()
+Sdp::~Sdp()
{
- _info ("SDP: Clean session media");
+ std::vector<sdpMedia *>::iterator iter = sessionAudioMedia_.begin();
- if (not sessionAudioMedia_.empty()) {
+ for (iter = sessionAudioMedia_.begin(); iter != sessionAudioMedia_.end(); ++iter)
+ delete *iter;
- std::vector<sdpMedia *>::iterator iter = sessionAudioMedia_.begin();
- sdpMedia *media;
-
- while (iter != sessionAudioMedia_.end()) {
- _debug ("delete media");
- media = *iter;
- delete media;
- ++iter;
- }
-
- sessionAudioMedia_.clear();
- }
+ for (iter = localAudioMediaCap_.begin(); iter != localAudioMediaCap_.end(); ++iter)
+ delete *iter;
}
-void Sdp::cleanLocalMediaCapabilities()
-{
- _info ("SDP: Clean local media capabilities");
-
- if (not localAudioMediaCap_.empty()) {
-
- std::vector<sdpMedia *>::iterator iter = localAudioMediaCap_.begin();
- sdpMedia *media;
-
- while (iter != localAudioMediaCap_.end()) {
- media = *iter;
- delete media;
- ++iter;
- }
-
- localAudioMediaCap_.clear();
- }
-}
-
void Sdp::setPortToAllMedia (int port)
{
setLocalPublishedAudioPort (port);
diff --git a/sflphone-common/src/sip/sdp.h b/sflphone-common/src/sip/sdp.h
index 9b6cca4579..40d3e0cced 100644
--- a/sflphone-common/src/sip/sdp.h
+++ b/sflphone-common/src/sip/sdp.h
@@ -72,6 +72,8 @@ class Sdp
*/
Sdp (pj_pool_t *pool);
+ ~Sdp();
+
/**
* Accessor for the internal memory pool
*/
--
GitLab