summaryrefslogtreecommitdiff
path: root/res/res_musiconhold.c
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-08-21 02:11:39 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-08-21 02:11:39 +0000
commit0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 (patch)
tree270b9c46c1e644483d6d2a35b509f43218ba3252 /res/res_musiconhold.c
parentf60ada0be22cd646454278e102d384a5dbaf7d59 (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: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_musiconhold.c')
-rw-r--r--res/res_musiconhold.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index c0d29acd3..8bcb62511 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1206,7 +1206,7 @@ static int init_classes(int reload)
return 1;
}
-static int load_module(void *mod)
+static int load_module(void)
{
int res;
@@ -1233,7 +1233,7 @@ static int load_module(void *mod)
return 0;
}
-static int reload(void *mod)
+static int reload(void)
{
if (init_classes(1))
ast_install_music_functions(local_ast_moh_start, local_ast_moh_stop, local_ast_moh_cleanup);
@@ -1241,20 +1241,13 @@ static int reload(void *mod)
return 0;
}
-static int unload_module(void *mod)
+static int unload_module(void)
{
return -1;
}
-static const char *description(void)
-{
- return "Music On Hold Resource";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-STD_MOD(MOD_0 | NO_USECOUNT | NO_UNLOAD, reload, NULL, NULL);
-
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Music On Hold Resource",
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload,
+ );