From 4b03897207848035c13ad20f8f69b3c264f0c448 Mon Sep 17 00:00:00 2001 From: kmoore Date: Tue, 19 Jul 2011 18:07:22 +0000 Subject: Merged revisions 328824 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.10 ................ r328824 | kmoore | 2011-07-19 13:05:21 -0500 (Tue, 19 Jul 2011) | 18 lines Merged revisions 328823 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r328823 | kmoore | 2011-07-19 12:57:18 -0500 (Tue, 19 Jul 2011) | 11 lines RTP bridge away with inband DTMF and feature detection When deciding whether Asterisk was allowed to bridge the call away from the core, chan_sip did not take into account the usage of features on dialed channels that require monitoring of DTMF on channels utilizing inband DTMF. This would cause Asterisk to allow the call to be locally or remotely bridged, preventing access to the data required to detect activations of such features. (closes 17237) Review: https://reviewboard.asterisk.org/r/1302/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328825 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk/rtp_engine.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/asterisk/rtp_engine.h') diff --git a/include/asterisk/rtp_engine.h b/include/asterisk/rtp_engine.h index e04303ca6..30270ec4a 100644 --- a/include/asterisk/rtp_engine.h +++ b/include/asterisk/rtp_engine.h @@ -349,6 +349,8 @@ struct ast_rtp_engine { void (*alt_remote_address_set)(struct ast_rtp_instance *instance, struct ast_sockaddr *sa); /*! Callback for changing DTMF mode */ int (*dtmf_mode_set)(struct ast_rtp_instance *instance, enum ast_rtp_dtmf_mode dtmf_mode); + /*! Callback for getting DTMF mode */ + enum ast_rtp_dtmf_mode (*dtmf_mode_get)(struct ast_rtp_instance *instance); /*! Callback for retrieving statistics */ int (*get_stat)(struct ast_rtp_instance *instance, struct ast_rtp_instance_stats *stats, enum ast_rtp_instance_stat stat); /*! Callback for setting QoS values */ -- cgit v1.2.3 From 28da2a199d7e1624ac56ccb27d3671117f4e2717 Mon Sep 17 00:00:00 2001 From: russell Date: Thu, 21 Jul 2011 20:26:44 +0000 Subject: Merged revisions 329257 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/10 ........ r329257 | russell | 2011-07-21 15:22:36 -0500 (Thu, 21 Jul 2011) | 2 lines s/1.10/10.0/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329258 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk/rtp_engine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asterisk/rtp_engine.h') diff --git a/include/asterisk/rtp_engine.h b/include/asterisk/rtp_engine.h index 30270ec4a..7e27f5a82 100644 --- a/include/asterisk/rtp_engine.h +++ b/include/asterisk/rtp_engine.h @@ -1061,7 +1061,7 @@ struct ast_rtp_payload_type ast_rtp_codecs_payload_lookup(struct ast_rtp_codecs * \retval pointer to format structure on success * \retval NULL on failure * - * \since 1.10 + * \since 10.0 */ struct ast_format *ast_rtp_codecs_get_payload_format(struct ast_rtp_codecs *codecs, int payload); -- cgit v1.2.3