diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-10 03:57:30 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-10 03:57:30 +0000 |
| commit | 91d94ac33192a93eaffce5881423064d4d2c71cd (patch) | |
| tree | c58f0f0abb34d137190c6cae2828efc70be41be9 /main/audiohook.c | |
| parent | acfb5ec8c734138a015421f05a0c2eccb9fd2583 (diff) | |
Merged revisions 187599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r187599 | tilghman | 2009-04-09 22:55:27 -0500 (Thu, 09 Apr 2009) | 2 lines
Modify headers and macros, according to Russell's suggestions on the -dev list
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@187601 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/audiohook.c')
| -rw-r--r-- | main/audiohook.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/audiohook.c b/main/audiohook.c index baf370dc7..6f6e08b3a 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -592,7 +592,7 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st ast_audiohook_write_frame(audiohook, direction, middle_frame); ast_audiohook_unlock(audiohook); } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; /* If this frame is being written out to the channel then we need to use whisper sources */ if (direction == AST_AUDIOHOOK_DIRECTION_WRITE && !AST_LIST_EMPTY(&audiohook_list->whisper_list)) { @@ -615,7 +615,7 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st } ast_audiohook_unlock(audiohook); } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; /* We take all of the combined whisper sources and combine them into the audio being written out */ for (i = 0, data1 = middle_frame->data.ptr, data2 = combine_buf; i < samples; i++, data1++, data2++) ast_slinear_saturated_add(data1, data2); @@ -638,7 +638,7 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st audiohook->manipulate_callback(audiohook, chan, middle_frame, direction); ast_audiohook_unlock(audiohook); } - AST_LIST_TRAVERSE_SAFE_END + AST_LIST_TRAVERSE_SAFE_END; end_frame = middle_frame; } |