aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-20 19:35:02 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-20 19:35:02 +0000
commit771cdeecd161c957e978308048906c8ac3508717 (patch)
tree14b50e57a2595242548184d532cbeeedf416020a /apps
parenta551cc79ac0419a2118ed04f54d3204e8315987c (diff)
Add load priority order, such that preload becomes unnecessary in most cases
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278132 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_confbridge.c6
-rw-r--r--apps/app_meetme.c3
-rw-r--r--apps/app_queue.c3
3 files changed, 9 insertions, 3 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index 88fc81a2d..daa54aa82 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -819,4 +819,8 @@ static int load_module(void)
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Conference Bridge Application");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Conference Bridge Application",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
+);
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 5ef9718f1..e40a91cbb 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -7068,9 +7068,10 @@ static int reload(void)
return load_config(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MeetMe conference bridge",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MeetMe conference bridge",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
);
diff --git a/apps/app_queue.c b/apps/app_queue.c
index c1e390660..15eebdb5d 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -8188,9 +8188,10 @@ static int reload(void)
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "True Call Queueing",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
);