aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-17 16:25:52 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-17 16:25:52 +0000
commit3971612e9d3296f9ded5d2d19fa9bfca8ba5b7d6 (patch)
treef07075e8c02ea3ef41f019c25555b52b7a2bc68a
parentdbe0faf683a1f25194abd1280c11844a94482f85 (diff)
Revert API change in release branches
This re-renames ast_rtp_update_source to ast_rtp_new_source git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@253158 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_h323.c2
-rw-r--r--channels/chan_mgcp.c2
-rw-r--r--channels/chan_sip.c10
-rw-r--r--channels/chan_skinny.c2
-rw-r--r--include/asterisk/rtp.h2
-rw-r--r--main/rtp.c2
6 files changed, 10 insertions, 10 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index f8a929d6e..167db198d 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -918,7 +918,7 @@ static int oh323_indicate(struct ast_channel *c, int condition, const void *data
res = 0;
break;
case AST_CONTROL_SRCUPDATE:
- ast_rtp_update_source(pvt->rtp);
+ ast_rtp_new_source(pvt->rtp);
res = 0;
break;
case AST_CONTROL_SRCCHANGE:
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 3f8b49e0d..8ac448a8c 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1442,7 +1442,7 @@ static int mgcp_indicate(struct ast_channel *ast, int ind, const void *data, siz
ast_moh_stop(ast);
break;
case AST_CONTROL_SRCUPDATE:
- ast_rtp_update_source(sub->rtp);
+ ast_rtp_new_source(sub->rtp);
break;
case AST_CONTROL_SRCCHANGE:
ast_rtp_change_source(sub->rtp);
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6d80d466f..831f433a3 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3864,7 +3864,7 @@ static int sip_answer(struct ast_channel *ast)
if (option_debug)
ast_log(LOG_DEBUG, "SIP answering channel: %s\n", ast->name);
- ast_rtp_update_source(p->rtp);
+ ast_rtp_new_source(p->rtp);
res = transmit_response_with_sdp(p, "200 OK", &p->initreq, XMIT_CRITICAL);
ast_set_flag(&p->flags[1], SIP_PAGE2_DIALOG_ESTABLISHED);
}
@@ -3899,7 +3899,7 @@ static int sip_write(struct ast_channel *ast, struct ast_frame *frame)
if ((ast->_state != AST_STATE_UP) &&
!ast_test_flag(&p->flags[0], SIP_PROGRESS_SENT) &&
!ast_test_flag(&p->flags[0], SIP_OUTGOING)) {
- ast_rtp_update_source(p->rtp);
+ ast_rtp_new_source(p->rtp);
if (!global_prematuremediafilter) {
p->invitestate = INV_EARLY_MEDIA;
transmit_provisional_response(p, "183 Session Progress", &p->initreq, 1);
@@ -4147,11 +4147,11 @@ static int sip_indicate(struct ast_channel *ast, int condition, const void *data
res = -1;
break;
case AST_CONTROL_HOLD:
- ast_rtp_update_source(p->rtp);
+ ast_rtp_new_source(p->rtp);
ast_moh_start(ast, data, p->mohinterpret);
break;
case AST_CONTROL_UNHOLD:
- ast_rtp_update_source(p->rtp);
+ ast_rtp_new_source(p->rtp);
ast_moh_stop(ast);
break;
case AST_CONTROL_VIDUPDATE: /* Request a video frame update */
@@ -4162,7 +4162,7 @@ static int sip_indicate(struct ast_channel *ast, int condition, const void *data
res = -1;
break;
case AST_CONTROL_SRCUPDATE:
- ast_rtp_update_source(p->rtp);
+ ast_rtp_new_source(p->rtp);
break;
case AST_CONTROL_SRCCHANGE:
ast_rtp_change_source(p->rtp);
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 48be77b9c..59e8cfa79 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2868,7 +2868,7 @@ static int skinny_indicate(struct ast_channel *ast, int ind, const void *data, s
case AST_CONTROL_PROCEEDING:
break;
case AST_CONTROL_SRCUPDATE:
- ast_rtp_update_source(sub->rtp);
+ ast_rtp_new_source(sub->rtp);
break;
case AST_CONTROL_SRCCHANGE:
ast_rtp_change_source(sub->rtp);
diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h
index 955e8bf99..14e4b8396 100644
--- a/include/asterisk/rtp.h
+++ b/include/asterisk/rtp.h
@@ -180,7 +180,7 @@ int ast_rtp_sendcng(struct ast_rtp *rtp, int level);
int ast_rtp_settos(struct ast_rtp *rtp, int tos);
/*! \brief Indicate that we need to set the marker bit */
-void ast_rtp_update_source(struct ast_rtp *rtp);
+void ast_rtp_new_source(struct ast_rtp *rtp);
/*! \brief Indicate that we need to set the marker bit and change the ssrc */
void ast_rtp_change_source(struct ast_rtp *rtp);
diff --git a/main/rtp.c b/main/rtp.c
index 76deb3c69..26127d2a4 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -2082,7 +2082,7 @@ int ast_rtp_settos(struct ast_rtp *rtp, int tos)
return res;
}
-void ast_rtp_update_source(struct ast_rtp *rtp)
+void ast_rtp_new_source(struct ast_rtp *rtp)
{
if (rtp) {
rtp->set_marker_bit = 1;