diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-09-26 20:11:44 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-09-26 20:11:44 +0000 |
| commit | becd11ddb8a7d83e0629620e770a38c97ad6eb9b (patch) | |
| tree | 2cffaaf05b8f928ad1e0e145671db59b398d8a6f /main/slinfactory.c | |
| parent | 6c8f54c1a8e187a863398ca17d9c2583a2e04bfb (diff) | |
Merged revisions 43695 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43695 | file | 2006-09-26 16:09:41 -0400 (Tue, 26 Sep 2006) | 2 lines
Slight overhaul of the whisper support. 1. We need to duplicate the frame from ast_translate 2. We need to ensure we always have signed linear coming in for signed linear combining. 3. We need to ensure we are always feeding signed linear out. 4. Properly store and restore write format when beeping on the channel we are whispering on. 5. Properly discontinue the stream on the channel for the beep. (issue #8019 reported by timkelly1980)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/slinfactory.c')
| -rw-r--r-- | main/slinfactory.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/main/slinfactory.c b/main/slinfactory.c index 0520dbcef..a07798b7c 100644 --- a/main/slinfactory.c +++ b/main/slinfactory.c @@ -74,12 +74,7 @@ int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f) } } - if (sf->trans) - frame = ast_translate(sf->trans, f, 0); - else - frame = ast_frdup(f); - - if (!frame) + if (!(frame = ast_frdup( (sf->trans) ? ast_translate(sf->trans, f, 0) : f ))) return 0; x = 0; |