diff options
author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-17 16:25:52 +0000 |
---|---|---|
committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-17 16:25:52 +0000 |
commit | df06770d0dbcda12bc67af72a9bcdf3de746cc19 (patch) | |
tree | 9ab19f0a60ed6dc470005fd482689c0c2fc870a8 | |
parent | 044650396a7ab2e6d93559075e447adce7f5dc86 (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.6.0@253158 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_h323.c | 2 | ||||
-rw-r--r-- | channels/chan_mgcp.c | 2 | ||||
-rw-r--r-- | channels/chan_sip.c | 10 | ||||
-rw-r--r-- | channels/chan_skinny.c | 2 | ||||
-rw-r--r-- | include/asterisk/rtp.h | 2 | ||||
-rw-r--r-- | main/rtp.c | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 640836731..8c4d734e4 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -919,7 +919,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 1e02db100..2eb045789 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -1477,7 +1477,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 e861f127b..9878a2c31 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5315,7 +5315,7 @@ static int sip_answer(struct ast_channel *ast) ast_setstate(ast, AST_STATE_UP); ast_debug(1, "SIP answering channel: %s\n", ast->name); - ast_rtp_update_source(p->rtp); + ast_rtp_new_source(p->rtp); ast_set_flag(&p->flags[1], SIP_PAGE2_DIALOG_ESTABLISHED); res = transmit_response_with_sdp(p, "200 OK", &p->initreq, XMIT_CRITICAL, FALSE); } @@ -5350,7 +5350,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, TRUE); @@ -5670,11 +5670,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 */ @@ -5693,7 +5693,7 @@ static int sip_indicate(struct ast_channel *ast, int condition, const void *data } 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 12533fbfc..17d31202a 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -3769,7 +3769,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 696fe7a95..8a4ec0f51 100644 --- a/include/asterisk/rtp.h +++ b/include/asterisk/rtp.h @@ -188,7 +188,7 @@ int ast_rtp_sendcng(struct ast_rtp *rtp, int level); int ast_rtp_setqos(struct ast_rtp *rtp, int tos, int cos, char *desc); /*! \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 8d6269397..4646dd24d 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2401,7 +2401,7 @@ int ast_rtp_setqos(struct ast_rtp *rtp, int tos, int cos, char *desc) return ast_netsock_set_qos(rtp->s, tos, cos, desc); } -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; |