diff options
| author | Mark Spencer <markster@digium.com> | 2005-03-05 03:20:55 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2005-03-05 03:20:55 +0000 |
| commit | badc4dec4681a14695ef64d067a012d4aaa215fa (patch) | |
| tree | 43bbc5fb738257b338682fa55d5417d784661ea2 /res/res_musiconhold.c | |
| parent | 7f97f0a332c5d65b5cf38ac497d9491d580f07e3 (diff) | |
Make mpg123 behave more nicely
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_musiconhold.c')
| -rwxr-xr-x | res/res_musiconhold.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index f948e206f..7e386c795 100755 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -945,11 +945,11 @@ static void ast_moh_destroy(void) while (moh) { if (moh->pid) { ast_log(LOG_DEBUG, "killing %d!\n", moh->pid); - stime = time(NULL) + 5; + stime = time(NULL) + 2; pid = moh->pid; moh->pid = 0; kill(pid, SIGKILL); - while ((bytes = read(moh->srcfd, buff, 8192)) && time(NULL) < stime) { + while ((ast_wait_for_input(moh->srcfd, 100) > -1) && (bytes = read(moh->srcfd, buff, 8192)) && time(NULL) < stime) { tbytes = tbytes + bytes; } ast_log(LOG_DEBUG, "mpg123 pid %d and child died after %d bytes read\n", pid, tbytes); |