diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-30 21:21:29 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-30 21:21:29 +0000 |
| commit | 8531434222f861baa49ccc8a2d01ca17504e357d (patch) | |
| tree | f41b05763249c71534fca5d5eae775d8ac4e7348 /main/app.c | |
| parent | 7b0b50b4da91a68c00d473bd86dee67f49a8db52 (diff) | |
Reverted 231616
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@231637 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/app.c')
| -rw-r--r-- | main/app.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/app.c b/main/app.c index 1c17984f4..881f99dad 100644 --- a/main/app.c +++ b/main/app.c @@ -55,7 +55,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") AST_THREADSTORAGE_PUBLIC(ast_str_thread_global_buf); -#define AST_MAX_FORMATS 10 +#define MAX_OTHER_FORMATS 10 static AST_RWLIST_HEAD_STATIC(groups, ast_group_info); @@ -693,8 +693,8 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile, char *fmts; char comment[256]; int x, fmtcnt = 1, res = -1, outmsg = 0; - struct ast_filestream *others[AST_MAX_FORMATS]; - char *sfmt[AST_MAX_FORMATS]; + struct ast_filestream *others[MAX_OTHER_FORMATS]; + char *sfmt[MAX_OTHER_FORMATS]; char *stringp = NULL; time_t start, end; struct ast_dsp *sildet = NULL; /* silence detector dsp */ @@ -747,8 +747,8 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile, sfmt[0] = ast_strdupa(fmts); while ((fmt = strsep(&stringp, "|"))) { - if (fmtcnt > AST_MAX_FORMATS - 1) { - ast_log(LOG_WARNING, "Please increase AST_MAX_FORMATS in file.h\n"); + if (fmtcnt > MAX_OTHER_FORMATS - 1) { + ast_log(LOG_WARNING, "Please increase MAX_OTHER_FORMATS in app.c\n"); break; } sfmt[fmtcnt++] = ast_strdupa(fmt); @@ -938,7 +938,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile, } if (prepend && outmsg) { - struct ast_filestream *realfiles[AST_MAX_FORMATS]; + struct ast_filestream *realfiles[MAX_OTHER_FORMATS]; struct ast_frame *fr; for (x = 0; x < fmtcnt; x++) { |