From: Matt O'Gorman Date: Mon, 11 Dec 2006 22:31:20 +0000 (+0000) Subject: Merged revisions 48396 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~3751 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a395bd7c1de4448c304f76fff54bb5cac3ab12ba;p=thirdparty%2Fasterisk.git Merged revisions 48396 via svnmerge from https://svn.digium.com/svn/asterisk/branches/1.4 ................ r48396 | mogorman | 2006-12-11 16:11:35 -0600 (Mon, 11 Dec 2006) | 12 lines Merged revisions 48394 via svnmerge from https://svn.digium.com/svn/asterisk/branches/1.2 ........ r48394 | mogorman | 2006-12-11 15:55:43 -0600 (Mon, 11 Dec 2006) | 4 lines app_externalivr needs a real silence file, and additional changes to add silence files into core instead of extra patch provided by bug 8177 with minor additions. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48397 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c index bcda8d6634..5e81445836 100644 --- a/apps/app_externalivr.c +++ b/apps/app_externalivr.c @@ -154,7 +154,7 @@ static int gen_nextfile(struct gen_state *state) if (state->current) { file_to_stream = state->current->filename; } else { - file_to_stream = "silence-10"; + file_to_stream = "silence/10"; u->playing_silence = 1; }