kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge playback cleanups (bug #6163)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2006-01-08 00:08:49 +00:00
parent f5678d89d4
commit 50ab29b64b
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/app_playback.c
View File

@@ -72,13 +72,13 @@ LOCAL_USER_DECL;
static int playback_exec(struct ast_channel *chan, void *data) static int playback_exec(struct ast_channel *chan, void *data)
{ {
int res = 0, mres = 0; int res = 0;
struct localuser *u; struct localuser *u;
char *tmp = NULL; char *tmp;
int option_skip=0; int option_skip=0;
int option_noanswer = 0; int option_noanswer = 0;
char *front = NULL, *back = NULL;
int priority_jump = 0; int priority_jump = 0;
AST_DECLARE_APP_ARGS(args, AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(filenames); AST_APP_ARG(filenames);
AST_APP_ARG(options); AST_APP_ARG(options);
@@ -89,15 +89,13 @@ static int playback_exec(struct ast_channel *chan, void *data)
return -1; return -1;
} }
LOCAL_USER_ADD(u);
tmp = ast_strdupa(data); tmp = ast_strdupa(data);
if (!tmp) { if (!tmp) {
ast_log(LOG_ERROR, "Out of memory!\n"); ast_log(LOG_ERROR, "Out of memory!\n");
LOCAL_USER_REMOVE(u);
return -1; return -1;
} }
LOCAL_USER_ADD(u);
AST_STANDARD_APP_ARGS(args, tmp); AST_STANDARD_APP_ARGS(args, tmp);
if (args.options) { if (args.options) {
@@ -119,13 +117,11 @@ static int playback_exec(struct ast_channel *chan, void *data)
res = ast_answer(chan); res = ast_answer(chan);
} }
if (!res) { if (!res) {
int mres = 0;
char *front;
ast_stopstream(chan); ast_stopstream(chan);
front = tmp; while (!res && (front = strsep(&tmp, "&"))) {
while (!res && front) {
if ((back = strchr(front, '&'))) {
*back = '\0';
back++;
}
res = ast_streamfile(chan, front, chan->language); res = ast_streamfile(chan, front, chan->language);
if (!res) { if (!res) {
res = ast_waitstream(chan, ""); res = ast_waitstream(chan, "");
@@ -137,12 +133,8 @@ static int playback_exec(struct ast_channel *chan, void *data)
res = 0; res = 0;
mres = 1; mres = 1;
} }
front = back;
} }
if (mres) pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", mres ? "FAILED" : "SUCCESS");
pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "FAILED");
else
pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "SUCCESS");
} }
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return res; return res;