kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-08 06:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "audiohook: Use manipulated frame instead of dropping it." into 13

Browse Source
This commit is contained in:
Matt Jordan
2015-07-22 20:02:26 -05:00
committed by Gerrit Code Review
parent ff83c115c7 f509730cb9
commit 4d8f47f4bf
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/audiohook.c
View File

@@ -1019,13 +1019,16 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st
audiohook_list_set_hook_rate(audiohook_list, audiohook, &internal_sample_rate); audiohook_list_set_hook_rate(audiohook_list, audiohook, &internal_sample_rate);
/* /*
* Feed in frame to manipulation. * Feed in frame to manipulation.
* */
if (!audiohook->manipulate_callback(audiohook, chan, middle_frame, direction)) {
/*
* XXX FAILURES ARE IGNORED XXX * XXX FAILURES ARE IGNORED XXX
* If the manipulation fails then the frame will be returned in its original state. * If the manipulation fails then the frame will be returned in its original state.
* Since there are potentially more manipulator callbacks in the list, no action should * Since there are potentially more manipulator callbacks in the list, no action should
* be taken here to exit early. * be taken here to exit early.
*/ */
audiohook->manipulate_callback(audiohook, chan, middle_frame, direction); middle_frame_manipulated = 1;
}
ast_audiohook_unlock(audiohook); ast_audiohook_unlock(audiohook);
} }
AST_LIST_TRAVERSE_SAFE_END; AST_LIST_TRAVERSE_SAFE_END;