diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-07-19 23:30:10 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-07-19 23:30:10 +0000 |
| commit | 643fb1ed1400a5c32177a40dbfcba943d6f989d7 (patch) | |
| tree | 7d5bf745f1ff9357f999f1786ce60166ad04e79d /main/channel.c | |
| parent | 2838683742cd21a452298801e41e85cd890add06 (diff) | |
Minor optimizations.
* Made ast_audiohook_detach_list() and ast_audiohook_write_list_empty()
NULL tolerant.
* Made ast_audiohook_detach_list() return void since it is a destructor.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@394836 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index f76d6a845..c5983199a 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2632,8 +2632,7 @@ void ast_set_hangupsource(struct ast_channel *chan, const char *source, int forc int ast_channel_has_audio_frame_or_monitor(struct ast_channel *chan) { return ast_channel_monitor(chan) - || (ast_channel_audiohooks(chan) - && !ast_audiohook_write_list_empty(ast_channel_audiohooks(chan))) + || !ast_audiohook_write_list_empty(ast_channel_audiohooks(chan)) || !ast_framehook_list_contains_no_active(ast_channel_framehooks(chan)); } |