From 2e5e82c03ddfe68fd23faf9d2176bc88eb695dee Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 20 Aug 2012 18:32:31 +0200 Subject: [PATCH 1/3] update ms2 (x11 bugfix) --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 6016a3ce7..826e43fc6 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 6016a3ce7577d51689bec71a0188385862aec6d9 +Subproject commit 826e43fc66469d9cee126e81b38919dd2bc542c3 From aca7607beab7929dcd00c3e3f6136ee415c70433 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 21 Aug 2012 10:32:26 +0200 Subject: [PATCH 2/3] add dtmf_player_amp propertyo --- coreapi/linphonecore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 4b6c02c93..e9142ba41 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4246,7 +4246,7 @@ static MSFilter *get_dtmf_gen(LinphoneCore *lc){ return stream->dtmfgen; } if (lc->ringstream==NULL){ - float amp=0.1; + float amp=lp_config_get_float(lc->config,"sound","dtmf_player_amp",0.1); MSSndCard *ringcard=lc->sound_conf.lsd_card ?lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard; if (ringcard == NULL) return NULL; From 75040297c12e118cea0ec87d2bc3980c290f8e86 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 21 Aug 2012 10:55:20 +0200 Subject: [PATCH 3/3] Update ms2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 826e43fc6..0778db71a 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 826e43fc66469d9cee126e81b38919dd2bc542c3 +Subproject commit 0778db71afdce04b55fe686f6a7c24aa909436c4