From 57ed9f670c2f0e48a549e9ae24e28ef17b1d6405 Mon Sep 17 00:00:00 2001 From: aymeric <aymeric@3f6dc0c8-ddfe-455d-9043-3cd528dc4637> Date: Tue, 29 Dec 2009 20:15:32 +0000 Subject: [PATCH] fix compilation for wince without log10f git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@796 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/mediastreamer2/build/wince/alldescs.h | 2 ++ linphone/mediastreamer2/build/wince/mediastreamer2.vcproj | 4 ++++ linphone/mediastreamer2/src/msvolume.c | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/linphone/mediastreamer2/build/wince/alldescs.h b/linphone/mediastreamer2/build/wince/alldescs.h index 697ce911eb..e5e1794013 100644 --- a/linphone/mediastreamer2/build/wince/alldescs.h +++ b/linphone/mediastreamer2/build/wince/alldescs.h @@ -28,6 +28,7 @@ extern MSFilterDesc ms_conf_desc; //extern MSFilterDesc ms_h263_dec_desc; extern MSFilterDesc ms_join_desc; extern MSFilterDesc ms_resample_desc; +extern MSFilterDesc ms_volume_desc; extern MSFilterDesc ms_ice_desc; extern MSFilterDesc ms_void_sink_desc; MSFilterDesc * ms_filter_descs[]={ @@ -59,6 +60,7 @@ MSFilterDesc * ms_filter_descs[]={ //&ms_h263_dec_desc, &ms_join_desc, &ms_resample_desc, +&ms_volume_desc, &ms_ice_desc, &ms_void_sink_desc, NULL diff --git a/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj b/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj index cc383ade88..84f96ae3d5 100644 --- a/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj +++ b/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj @@ -1447,6 +1447,10 @@ RelativePath="..\..\src\msticker.c" > </File> + <File + RelativePath="..\..\src\msvolume.c" + > + </File> <File RelativePath="..\..\src\mswebcam.c" > diff --git a/linphone/mediastreamer2/src/msvolume.c b/linphone/mediastreamer2/src/msvolume.c index e9a747cebb..9083c23031 100644 --- a/linphone/mediastreamer2/src/msvolume.c +++ b/linphone/mediastreamer2/src/msvolume.c @@ -105,7 +105,11 @@ static void volume_uninit(MSFilter *f){ static int volume_get(MSFilter *f, void *arg){ float *farg=(float*)arg; Volume *v=(Volume*)f->data; +#ifndef _WIN32_WCE *farg=10*log10f((v->energy+1)/max_e); +#else + *farg=(float)(10*log10((v->energy+1)/max_e)); +#endif return 0; } -- GitLab