read conference sample rate from config file

This commit is contained in:
Simon Morlat 2011-11-14 11:31:11 +01:00
parent c5b5ad0836
commit 43e8b0bbef
2 changed files with 5 additions and 4 deletions

View file

@ -24,13 +24,14 @@
*/
#include "private.h"
#include "lpconfig.h"
#include "mediastreamer2/msvolume.h"
static void conference_check_init(LinphoneConference *ctx){
static void conference_check_init(LinphoneConference *ctx, int samplerate){
if (ctx->conf==NULL){
MSAudioConferenceParams params;
params.samplerate=16000;
params.samplerate=samplerate;
ctx->conf=ms_audio_conference_new(&params);
}
}
@ -137,7 +138,7 @@ int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call){
ms_error("Already in conference");
return -1;
}
conference_check_init(&lc->conf_ctx);
conference_check_init(&lc->conf_ctx, lp_config_get_int(lc->config, "sound","conference_rate",16000));
call->params.in_conference=TRUE;
call->params.has_video=FALSE;
call->params.media_encryption=LinphoneMediaEncryptionNone;

@ -1 +1 @@
Subproject commit 4dd9f772c0fef23b5314b9118dae909904c49562
Subproject commit 4ee916b3fcae0aba38a0d595079298242c9ac2cd