kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 11:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ast_rtp_early_media to ast_rtp_early_bridge to avoid confusion.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2006-06-09 09:47:44 +00:00
parent ce10b34ca6
commit 9f5aa13142
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_dial.c
View File

@@ -576,8 +576,8 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR |
OPT_CALLEE_PARK | OPT_CALLER_PARK | OPT_CALLEE_PARK | OPT_CALLER_PARK |
DIAL_NOFORWARDHTML); DIAL_NOFORWARDHTML);
/* Setup early media if appropriate */ /* Setup RTP early bridge if appropriate */
ast_rtp_early_media(in, peer); ast_rtp_early_bridge(in, peer);
} }
/* If call has been answered, then the eventual hangup is likely to be normal hangup */ /* If call has been answered, then the eventual hangup is likely to be normal hangup */
in->hangupcause = AST_CAUSE_NORMAL_CLEARING; in->hangupcause = AST_CAUSE_NORMAL_CLEARING;
@@ -606,7 +606,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
ast_verbose(VERBOSE_PREFIX_3 "%s is ringing\n", c->name); ast_verbose(VERBOSE_PREFIX_3 "%s is ringing\n", c->name);
/* Setup early media if appropriate */ /* Setup early media if appropriate */
if (single) if (single)
ast_rtp_early_media(in, c); ast_rtp_early_bridge(in, c);
if (!(*sentringing) && !ast_test_flag(outgoing, OPT_MUSICBACK)) { if (!(*sentringing) && !ast_test_flag(outgoing, OPT_MUSICBACK)) {
ast_indicate(in, AST_CONTROL_RINGING); ast_indicate(in, AST_CONTROL_RINGING);
(*sentringing)++; (*sentringing)++;
@@ -617,7 +617,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
ast_verbose (VERBOSE_PREFIX_3 "%s is making progress passing it to %s\n", c->name, in->name); ast_verbose (VERBOSE_PREFIX_3 "%s is making progress passing it to %s\n", c->name, in->name);
/* Setup early media if appropriate */ /* Setup early media if appropriate */
if (single) if (single)
ast_rtp_early_media(in, c); ast_rtp_early_bridge(in, c);
if (!ast_test_flag(outgoing, OPT_RINGBACK)) if (!ast_test_flag(outgoing, OPT_RINGBACK))
ast_indicate(in, AST_CONTROL_PROGRESS); ast_indicate(in, AST_CONTROL_PROGRESS);
break; break;
@@ -630,7 +630,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose (VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n", c->name, in->name); ast_verbose (VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n", c->name, in->name);
if (single) if (single)
ast_rtp_early_media(in, c); ast_rtp_early_bridge(in, c);
if (!ast_test_flag(outgoing, OPT_RINGBACK)) if (!ast_test_flag(outgoing, OPT_RINGBACK))
ast_indicate(in, AST_CONTROL_PROCEEDING); ast_indicate(in, AST_CONTROL_PROCEEDING);
break; break;
@@ -1608,7 +1608,7 @@ out:
sentringing = 0; sentringing = 0;
ast_indicate(chan, -1); ast_indicate(chan, -1);
} }
ast_rtp_early_media(chan, NULL); ast_rtp_early_bridge(chan, NULL);
hanguptree(outgoing, NULL); hanguptree(outgoing, NULL);
pbx_builtin_setvar_helper(chan, "DIALSTATUS", status); pbx_builtin_setvar_helper(chan, "DIALSTATUS", status);
if (option_debug) if (option_debug)

4
include/asterisk/rtp.h
View File

@@ -182,7 +182,9 @@ void ast_rtp_proto_unregister(struct ast_rtp_protocol *proto);
int ast_rtp_make_compatible(struct ast_channel *dest, struct ast_channel *src, int media); int ast_rtp_make_compatible(struct ast_channel *dest, struct ast_channel *src, int media);
int ast_rtp_early_media(struct ast_channel *dest, struct ast_channel *src); /*! \brief If possible, create an early bridge directly between the devices without
having to send a re-invite later */
int ast_rtp_early_bridge(struct ast_channel *dest, struct ast_channel *src);
void ast_rtp_stop(struct ast_rtp *rtp); void ast_rtp_stop(struct ast_rtp *rtp);

2
rtp.c
View File

@@ -1274,7 +1274,7 @@ static struct ast_rtp_protocol *get_proto(struct ast_channel *chan)
return cur; return cur;
} }
int ast_rtp_early_media(struct ast_channel *dest, struct ast_channel *src) int ast_rtp_early_bridge(struct ast_channel *dest, struct ast_channel *src)
{ {
struct ast_rtp *destp, *srcp=NULL; /* Audio RTP Channels */ struct ast_rtp *destp, *srcp=NULL; /* Audio RTP Channels */
struct ast_rtp *vdestp, *vsrcp=NULL; /* Video RTP channels */ struct ast_rtp *vdestp, *vsrcp=NULL; /* Video RTP channels */