diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
| commit | 8b0c007ad990aa27d9868da49215fd1076ac77cc (patch) | |
| tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /apps/app_waitforsilence.c | |
| parent | a42edc84034f91932a3e12d503e07f76a6eb498a (diff) | |
merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
- support for embedded modules
- support for static builds
- simpler cross-compilation support
- simpler module/loader interface (no exported symbols)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_waitforsilence.c')
| -rw-r--r-- | apps/app_waitforsilence.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c index 3352aa4b9..890bf01eb 100644 --- a/apps/app_waitforsilence.c +++ b/apps/app_waitforsilence.c @@ -48,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/module.h" #include "asterisk/options.h" -static char *tdesc = "Wait For Silence"; static char *app = "WaitForSilence"; static char *synopsis = "Waits for a specified amount of silence"; static char *descrip = @@ -61,7 +60,6 @@ static char *descrip = " - WaitForSilence(500|2) will wait for 1/2 second of silence, twice\n" " - WaitForSilence(1000) will wait for 1 second of silence, once\n"; -LOCAL_USER_DECL; static int do_waiting(struct ast_channel *chan, int maxsilence) { @@ -149,11 +147,11 @@ static int do_waiting(struct ast_channel *chan, int maxsilence) { static int waitforsilence_exec(struct ast_channel *chan, void *data) { int res = 1; - struct localuser *u; + struct ast_module_user *u; int maxsilence = 1000; int iterations = 1, i; - LOCAL_USER_ADD(u); + u = ast_module_user_add(chan); res = ast_answer(chan); /* Answer the channel */ @@ -169,36 +167,26 @@ static int waitforsilence_exec(struct ast_channel *chan, void *data) for (i=0; (i<iterations) && (res == 1); i++) { res = do_waiting(chan, maxsilence); } - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); if (res > 0) res = 0; return res; } -static int unload_module(void *mod) +static int unload_module(void) { int res; res = ast_unregister_application(app); - STANDARD_HANGUP_LOCALUSERS; + ast_module_user_hangup_all(); return res; } -static int load_module(void *mod) +static int load_module(void) { return ast_register_application(app, waitforsilence_exec, synopsis, descrip); } -static const char *description(void) -{ - return tdesc; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD1; +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Wait For Silence"); |