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

don't use trunk only API for frame data

Browse Source 
(closes issue #12881)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-06-18 12:34:22 +00:00
parent 95934c81c2
commit 2f6a7d610d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_fax.c
View File

@@ -403,7 +403,7 @@ static int transmit_audio(fax_session *s)
to slinear so it will still be received by ast_read */
if (inf->frametype == AST_FRAME_VOICE && inf->subclass == AST_FORMAT_SLINEAR) {
if (fax_rx(&fax, inf->data.ptr, inf->samples) < 0) {
if (fax_rx(&fax, inf->data, inf->samples) < 0) {
/* I know fax_rx never returns errors. The check here is for good style only */
ast_log(LOG_WARNING, "fax_rx returned error\n");
res = -1;
@@ -417,7 +417,7 @@ static int transmit_audio(fax_session *s)
}
} else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 &&
inf->datalen == sizeof(enum ast_control_t38)) {
t38control =*((enum ast_control_t38 *) inf->data.ptr);
t38control =*((enum ast_control_t38 *) inf->data);
if (t38control == AST_T38_NEGOTIATED) {
/* T38 switchover completed */
ast_debug(1, "T38 negotiated, finishing audio loop\n");
@@ -522,7 +522,7 @@ static int transmit_t38(fax_session *s)
ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass, inf->datalen);
if (inf->frametype == AST_FRAME_MODEM && inf->subclass == AST_MODEM_T38) {
t38_core_rx_ifp_packet(&t38.t38, inf->data.ptr, inf->datalen, inf->seqno);
t38_core_rx_ifp_packet(&t38.t38, inf->data, inf->datalen, inf->seqno);
/* Watchdog */
if (last_state != t38.t30_state.state) {
@@ -532,7 +532,7 @@ static int transmit_t38(fax_session *s)
} else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38 &&
inf->datalen == sizeof(enum ast_control_t38)) {
t38control = *((enum ast_control_t38 *) inf->data.ptr);
t38control = *((enum ast_control_t38 *) inf->data);
if (t38control == AST_T38_TERMINATED || t38control == AST_T38_REFUSED) {
ast_debug(1, "T38 down, terminating\n");