diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-07-11 16:49:29 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-07-11 16:49:29 +0000 |
commit | 12fd7ca3bbc8df1293b20a615646e35b5033cb72 (patch) | |
tree | 7dc81a4ba4c64587bf70a946a9c42e10484fef81 | |
parent | 4a875ab9b7102efd4c9b99d25fec5a3c08e22a94 (diff) |
Version 0.2.0 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@483 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | formats/format_g723.c | 2 | ||||
-rwxr-xr-x | formats/format_gsm.c | 2 | ||||
-rwxr-xr-x | formats/format_mp3.c | 2 | ||||
-rwxr-xr-x | formats/format_pcm.c | 2 | ||||
-rwxr-xr-x | formats/format_vox.c | 2 | ||||
-rwxr-xr-x | formats/format_wav_gsm.c | 2 | ||||
-rwxr-xr-x | include/asterisk/module.h | 2 | ||||
-rwxr-xr-x | loader.c | 5 | ||||
-rwxr-xr-x | res/res_musiconhold.c | 9 |
9 files changed, 16 insertions, 12 deletions
diff --git a/formats/format_g723.c b/formats/format_g723.c index c54a640b3..195815a46 100755 --- a/formats/format_g723.c +++ b/formats/format_g723.c @@ -325,7 +325,7 @@ int unload_module() tmp = glist; while(tmp) { if (tmp->owner) - ast_softhangup(tmp->owner); + ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD); tmpl = tmp; tmp = tmp->next; free(tmpl); diff --git a/formats/format_gsm.c b/formats/format_gsm.c index 1ac986934..1ac981f7f 100755 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -271,7 +271,7 @@ int unload_module() tmp = glist; while(tmp) { if (tmp->owner) - ast_softhangup(tmp->owner); + ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD); tmpl = tmp; tmp = tmp->next; free(tmpl); diff --git a/formats/format_mp3.c b/formats/format_mp3.c index e1ee08651..5c730f098 100755 --- a/formats/format_mp3.c +++ b/formats/format_mp3.c @@ -269,7 +269,7 @@ int unload_module() tmp = glist; while(tmp) { if (tmp->owner) - ast_softhangup(tmp->owner); + ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD); tmpl = tmp; tmp = tmp->next; free(tmpl); diff --git a/formats/format_pcm.c b/formats/format_pcm.c index befa05698..8576f6995 100755 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -266,7 +266,7 @@ int unload_module() tmp = glist; while(tmp) { if (tmp->owner) - ast_softhangup(tmp->owner); + ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD); tmpl = tmp; tmp = tmp->next; free(tmpl); diff --git a/formats/format_vox.c b/formats/format_vox.c index 67934219a..94957e7d7 100755 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -390,7 +390,7 @@ int unload_module() tmp = glist; while(tmp) { if (tmp->owner) - ast_softhangup(tmp->owner); + ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD); tmpl = tmp; tmp = tmp->next; free(tmpl); diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index b1a8020d9..d7f718f6d 100755 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -563,7 +563,7 @@ int unload_module() tmp = glist; while(tmp) { if (tmp->owner) - ast_softhangup(tmp->owner); + ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD); tmpl = tmp; tmp = tmp->next; free(tmpl); diff --git a/include/asterisk/module.h b/include/asterisk/module.h index b270c111c..93d059d95 100755 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -194,7 +194,7 @@ void ast_module_reload(void); pthread_mutex_lock(&localuser_lock); \ u = localusers; \ while(u) { \ - ast_softhangup(u->chan); \ + ast_softhangup(u->chan, AST_SOFTHANGUP_APPUNLOAD); \ ul = u; \ u = u->next; \ free(ul); \ @@ -22,6 +22,7 @@ #include <asterisk/logger.h> #include <asterisk/channel.h> #include <asterisk/term.h> +#include <asterisk/manager.h> #include <dlfcn.h> #include <asterisk/md5.h> #define __USE_GNU @@ -137,8 +138,8 @@ void ast_module_reload(void) { struct module *m; - /* We'll do the logger the favor of calling its reload here first */ - + /* We'll do the logger and manager the favor of calling its reload here first */ + reload_manager(); ast_pthread_mutex_lock(&modlock); m = module_list; diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index c696bd55a..2630ba7c2 100755 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -100,8 +100,9 @@ static pthread_mutex_t moh_lock = AST_MUTEX_INITIALIZER; static void child_handler(int sig) { int status; - if (wait4(-1,&status, WNOHANG, NULL)<1) - ast_log(LOG_NOTICE, "Huh? Child handler, but nobody there?\n"); + if (wait4(-1,&status, WNOHANG, NULL)<1) + if (option_debug) + ast_log(LOG_DEBUG, "Huh? Child handler, but nobody there?\n"); } static int spawn_mp3(struct mohclass *class) @@ -126,7 +127,9 @@ static int spawn_mp3(struct mohclass *class) argv[3] = "--mono"; argv[4] = "-r"; argv[5] = "8000"; - argc = 6; + argv[6] = "-b"; + argv[7] = "2048"; + argc = 8; if (class->quiet) { argv[argc++] = "-f"; argv[argc++] = "8192"; |