From 87c0dcd6bd9382d6c46edccadce2c375c19752bf Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Wed, 23 Sep 2009 09:42:41 +0000
Subject: [PATCH] fix bug and memleak in msvolume.
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@676 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
linphone/coreapi/exevents.c | 4 ++++
linphone/gtk-glade/Makefile.am | 2 +-
linphone/mediastreamer2/src/msvolume.c | 6 +++++-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/linphone/coreapi/exevents.c b/linphone/coreapi/exevents.c
index eb14a58ad7..66aa7e8ec4 100644
--- a/linphone/coreapi/exevents.c
+++ b/linphone/coreapi/exevents.c
@@ -195,6 +195,10 @@ int linphone_call_failure(LinphoneCore *lc, eXosip_event_t *ev)
case 415:
lc->vtable.display_status(lc,_("Remote user cannot support any of proposed codecs."));
break;
+ case 422:
+ /*ignore: eXosip_automatic_action will do the job of retrying with a greater Session-Expires*/
+ return 0;
+ break;
case 480:
tmpmsg=msg480;
case 486:
diff --git a/linphone/gtk-glade/Makefile.am b/linphone/gtk-glade/Makefile.am
index 1370554ea6..4a744249c3 100644
--- a/linphone/gtk-glade/Makefile.am
+++ b/linphone/gtk-glade/Makefile.am
@@ -88,5 +88,5 @@ version_date.h: $(top_srcdir)/configure.in
newdate:
rm -f version_date.h
-CLEANFILES=version_date.h
+CLEANFILES=version_date.h linphone.res
diff --git a/linphone/mediastreamer2/src/msvolume.c b/linphone/mediastreamer2/src/msvolume.c
index 1deb38b58d..ba8b068eec 100644
--- a/linphone/mediastreamer2/src/msvolume.c
+++ b/linphone/mediastreamer2/src/msvolume.c
@@ -92,6 +92,10 @@ static void volume_init(MSFilter *f){
static void volume_uninit(MSFilter *f){
Volume *v=(Volume*)f->data;
+#ifdef HAVE_SPEEXDSP
+ if (v->speex_pp)
+ speex_preprocess_state_destroy(v->speex_pp);
+#endif
ms_bufferizer_destroy(v->buffer);
ms_free(f->data);
}
@@ -404,7 +408,7 @@ MSFilterDesc ms_volume_desc={
1,
1,
volume_init,
- NULL,
+ volume_preprocess,
volume_process,
NULL,
volume_uninit,
--
GitLab