mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-01 18:06:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use correct macro __ios --> TARGET_OS_IPHONE

Browse source
This commit is contained in:
Benjamin Reis 2017-03-29 10:52:56 +02:00
parent f23b1d3246
commit 09f4e2324e
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
coreapi/linphonecore.c
View file

@ -1179,7 +1179,7 @@ static void sound_config_read(LinphoneCore *lc)
} }
lc->sound_conf.latency=0; lc->sound_conf.latency=0;
#ifndef __ios #if TARGET_OS_IPHONE
tmp=TRUE; tmp=TRUE;
#else #else
tmp=FALSE; /* on iOS we have builtin echo cancellation.*/ tmp=FALSE; /* on iOS we have builtin echo cancellation.*/
@ -1687,7 +1687,7 @@ static void video_config_read(LinphoneCore *lc){
linphone_core_set_preferred_framerate(lc,lp_config_get_float(lc->config,"video","framerate",0)); linphone_core_set_preferred_framerate(lc,lp_config_get_float(lc->config,"video","framerate",0));
#if defined(__ANDROID__) || defined(__ios) #if defined(__ANDROID__) || TARGET_OS_IPHONE
automatic_video=0; automatic_video=0;
#endif #endif
capture=lp_config_get_int(lc->config,"video","capture",1); capture=lp_config_get_int(lc->config,"video","capture",1);

6
coreapi/ringtoneplayer.c
View file

@ -21,11 +21,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "private.h" #include "private.h"
#include <mediastreamer2/msfactory.h> #include <mediastreamer2/msfactory.h>
#if __APPLE__
#include "TargetConditionals.h"
#endif
int linphone_ringtoneplayer_start(MSFactory *factory, LinphoneRingtonePlayer* rp, MSSndCard* card, const char* ringtone, int loop_pause_ms) { int linphone_ringtoneplayer_start(MSFactory *factory, LinphoneRingtonePlayer* rp, MSSndCard* card, const char* ringtone, int loop_pause_ms) {
return linphone_ringtoneplayer_start_with_cb(factory, rp, card, ringtone, loop_pause_ms, NULL, NULL); return linphone_ringtoneplayer_start_with_cb(factory, rp, card, ringtone, loop_pause_ms, NULL, NULL);
} }
#ifdef __ios #if TARGET_OS_IPHONE
#include "ringtoneplayer_ios.h" #include "ringtoneplayer_ios.h"

2
mediastreamer2

@ -1 +1 @@
Subproject commit b937df188829f73c3f5db35ff0191aa695f27884 Subproject commit 81dd23b3125568af5aa4a2973105a1c98a153986