diff options
| author | Michiel van Baak <michiel@vanbaak.info> | 2008-05-22 16:29:54 +0000 |
|---|---|---|
| committer | Michiel van Baak <michiel@vanbaak.info> | 2008-05-22 16:29:54 +0000 |
| commit | f1e9371da8b502999b9aec1db7f68635395a7b6a (patch) | |
| tree | bcbbf4eda53cdb8257bbc7add4616e01e31b1ae2 /apps/app_speech_utils.c | |
| parent | 2c7760e6262c97afc19037890242299421d62157 (diff) | |
- revert change to ast_queue_hangup and create ast_queue_hangup_with_cause
- make data member of the ast_frame struct a named union instead of a void
Recently the ast_queue_hangup function got a new parameter, the hangupcause
Feedback came in that this is no good and that instead a new function should be created.
This I did.
The hangupcause was stored in the seqno member of the ast_frame struct. This is not very
elegant, and since there's already a data member that one should be used.
Problem is, this member was a void *.
Now it's a named union so it can hold a pointer, an uint32 and there's a padding in case someone
wants to store another type in there in the future.
This commit is so massive, because all ast_frame.data uses have to be
altered to ast_frame.data.data
Thanks russellb and kpfleming for the feedback.
(closes issue #12674)
Reported by: mvanbaak
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@117802 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_speech_utils.c')
| -rw-r--r-- | apps/app_speech_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c index 5082478af..568c01bc3 100644 --- a/apps/app_speech_utils.c +++ b/apps/app_speech_utils.c @@ -647,7 +647,7 @@ static int speech_background(struct ast_channel *chan, void *data) } /* Write audio frame out to speech engine if no DTMF has been received */ if (!strlen(dtmf) && f != NULL && f->frametype == AST_FRAME_VOICE) { - ast_speech_write(speech, f->data, f->datalen); + ast_speech_write(speech, f->data.ptr, f->datalen); } break; case AST_SPEECH_STATE_WAIT: |