diff options
| author | Kevin Harwell <kharwell@digium.com> | 2013-12-13 16:38:57 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2013-12-13 16:38:57 +0000 |
| commit | ce18946de46a6f16463391a9c07af02b8ee4e925 (patch) | |
| tree | 3679fcee389fa7725b00389e6bd7f99cf058bb2e /res/res_stasis_playback.c | |
| parent | fc8c0ef28f669a53bcab3a862b4ef71b33665b2e (diff) | |
ARI: Adding a channel to a bridge while a live recording is active blocks
Added the ability to have rules that are checked when adding and/or removing
channels to/from a bridge. In this case, if a channel is currently recording
and someone attempts to add it to a bridge an "is recording" rule is checked,
fails, and a 409 conflict is returned.
Also command functions now return an integer value that can be descriptive of
what kind of problems, if any, occurred before or during execution.
(closes issue ASTERISK-22624)
Reported by: Joshua Colp
Review: https://reviewboard.asterisk.org/r/2947/
........
Merged revisions 403749 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_stasis_playback.c')
| -rw-r--r-- | res/res_stasis_playback.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c index ce29de12c..f6cd5404e 100644 --- a/res/res_stasis_playback.c +++ b/res/res_stasis_playback.c @@ -389,7 +389,7 @@ static void remove_from_playbacks(struct stasis_app_playback *playback) OBJ_POINTER | OBJ_UNLINK | OBJ_NODATA); } -static void *play_uri(struct stasis_app_control *control, +static int play_uri(struct stasis_app_control *control, struct ast_channel *chan, void *data) { RAII_VAR(struct stasis_app_playback *, playback, NULL, @@ -400,7 +400,7 @@ static void *play_uri(struct stasis_app_control *control, playback = data; if (!control) { - return NULL; + return -1; } bridge = stasis_app_get_bridge(control); @@ -435,7 +435,7 @@ static void *play_uri(struct stasis_app_control *control, play_on_channel(playback, chan); } - return NULL; + return 0; } static void set_target_uri( |