diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index de9bac4cf..7de37b853 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -5809,6 +5809,14 @@ void linphone_core_start_dtmf_stream(LinphoneCore* lc) { lc->ringstream_autorelease=FALSE; /*disable autorelease mode*/ } +/** + * Whenever the liblinphone is playing a ring to advertise an incoming call or ringback of an outgoing call, this function stops + * the ringing. Typical use is to stop ringing when the user requests to ignore the call. + * + * @param lc The LinphoneCore object + * + * @ingroup media_parameters +**/ void linphone_core_stop_ringing(LinphoneCore* lc) { if (lc->ringstream) { ring_stop(lc->ringstream); diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 231ba0c05..1fafac383 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -1428,19 +1428,20 @@ int linphone_core_set_playback_device(LinphoneCore *lc, const char * devid); int linphone_core_set_capture_device(LinphoneCore *lc, const char * devid); char linphone_core_get_sound_source(LinphoneCore *lc); void linphone_core_set_sound_source(LinphoneCore *lc, char source); +LINPHONE_PUBLIC void linphone_core_stop_ringing(LinphoneCore *lc); LINPHONE_PUBLIC void linphone_core_set_ring(LinphoneCore *lc, const char *path); -const char *linphone_core_get_ring(const LinphoneCore *lc); +LINPHONE_PUBLIC const char *linphone_core_get_ring(const LinphoneCore *lc); LINPHONE_PUBLIC void linphone_core_verify_server_certificates(LinphoneCore *lc, bool_t yesno); -void linphone_core_verify_server_cn(LinphoneCore *lc, bool_t yesno); +LINPHONE_PUBLIC void linphone_core_verify_server_cn(LinphoneCore *lc, bool_t yesno); LINPHONE_PUBLIC void linphone_core_set_root_ca(LinphoneCore *lc, const char *path); LINPHONE_PUBLIC const char *linphone_core_get_root_ca(LinphoneCore *lc); LINPHONE_PUBLIC void linphone_core_set_ringback(LinphoneCore *lc, const char *path); -const char * linphone_core_get_ringback(const LinphoneCore *lc); +LINPHONE_PUBLIC const char * linphone_core_get_ringback(const LinphoneCore *lc); -void linphone_core_set_remote_ringback_tone(LinphoneCore *lc,const char *); -const char *linphone_core_get_remote_ringback_tone(const LinphoneCore *lc); +LINPHONE_PUBLIC void linphone_core_set_remote_ringback_tone(LinphoneCore *lc,const char *); +LINPHONE_PUBLIC const char *linphone_core_get_remote_ringback_tone(const LinphoneCore *lc); -int linphone_core_preview_ring(LinphoneCore *lc, const char *ring,LinphoneCoreCbFunc func,void * userdata); +LINPHONE_PUBLIC int linphone_core_preview_ring(LinphoneCore *lc, const char *ring,LinphoneCoreCbFunc func,void * userdata); LINPHONE_PUBLIC void linphone_core_enable_echo_cancellation(LinphoneCore *lc, bool_t val); LINPHONE_PUBLIC bool_t linphone_core_echo_cancellation_enabled(LinphoneCore *lc); diff --git a/coreapi/private.h b/coreapi/private.h index c6ef374f9..cae6254b0 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -758,7 +758,6 @@ void linphone_event_set_state(LinphoneEvent *lev, LinphoneSubscriptionState stat void linphone_event_set_reason(LinphoneEvent *lev, LinphoneReason reason); LinphoneSubscriptionState linphone_subscription_state_from_sal(SalSubscribeStatus ss); const LinphoneContent *linphone_content_from_sal_body(LinphoneContent *obj, const SalBody *ref); -void linphone_core_stop_ringing(LinphoneCore *lc); void linphone_core_invalidate_friend_subscriptions(LinphoneCore *lc); #ifdef __cplusplus diff --git a/mediastreamer2 b/mediastreamer2 index 43b68b22c..453f0057b 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 43b68b22cf8d0d1b0b5a064516d35899e5527358 +Subproject commit 453f0057b5a6b872cd1deedf7873168ab912378f diff --git a/oRTP b/oRTP index 7c2805c2e..679d0d325 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 7c2805c2e2c1edadf9e9efe313d98f06c4c3614a +Subproject commit 679d0d325f22ab3670eeee19b3f09d494efe3056