Commit graph

9 commits

Author SHA1 Message Date
Benjamin Reis
09f4e2324e Use correct macro __ios --> TARGET_OS_IPHONE 2017-03-29 10:52:56 +02:00
Gautier Pelloux-Prayer
f6381d913a license: update FSF address 2016-07-27 11:58:38 +02:00
Brieuc Viel
9afc1e1509 fix compilation iOS 2016-02-02 14:30:44 +01:00
Sandrine Avakian
642a624e59 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory
# Conflicts:
#	mediastreamer2
2016-01-22 10:52:50 +01:00
Gautier Pelloux-Prayer
82634eb795 ringtoneplayer: handle NULL ringtone for iOS too 2016-01-22 10:03:48 +01:00
Sandrine Avakian
b8468a56a1 Attempt on fixing ring stream. 2016-01-21 13:20:19 +01:00
Sandrine Avakian
48b10c1724 Update media streamer2 : text stream, ring stream, audio stream.
Adding declaration of void ms_factory_set_mtu  in factory.h.
Adding a getter linphone_core_get_factory(void *lc) in linphonecore.h.
2016-01-19 13:58:21 +01:00
Gautier Pelloux-Prayer
f903eeb0df ringtoneplayer.c: use include, not import 2016-01-05 11:21:55 +01:00
Gautier Pelloux-Prayer
b711888ac0 ringplayer: add ring player object to play ringtones (CAF on iOS, WAV otherwise) 2016-01-05 10:31:23 +01:00