kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweak to make music load classes more elegantly

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Anthony Minessale II
2005-01-04 19:09:00 +00:00
parent edd3fe50fb
commit 66049c961b
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
res/res_musiconhold.c
View File

@@ -700,7 +700,6 @@ static int moh_scan_files(struct mohclass *class) {
getcwd(path, 512); getcwd(path, 512);
chdir(class->dir); chdir(class->dir);
memset(class->filearray, 0, MAX_MOHFILES*MAX_MOHFILE_LEN); memset(class->filearray, 0, MAX_MOHFILES*MAX_MOHFILE_LEN);
while ((files_dirent = readdir(files_DIR))) { while ((files_dirent = readdir(files_DIR))) {
if ((strlen(files_dirent->d_name) < 4) || ((strlen(files_dirent->d_name) + dirnamelen) >= MAX_MOHFILE_LEN)) if ((strlen(files_dirent->d_name) < 4) || ((strlen(files_dirent->d_name) + dirnamelen) >= MAX_MOHFILE_LEN))
continue; continue;
@@ -984,11 +983,21 @@ static struct ast_cli_entry cli_moh = { { "moh", "reload"}, moh_cli, "Music On
static struct ast_cli_entry cli_moh_files_show = { { "moh", "files", "show"}, cli_files_show, "List MOH file-based classes", "Lists all loaded file-based MOH classes and their files", NULL}; static struct ast_cli_entry cli_moh_files_show = { { "moh", "files", "show"}, cli_files_show, "List MOH file-based classes", "Lists all loaded file-based MOH classes and their files", NULL};
static int init_classes(void) {
struct mohclass *moh;
load_moh_classes();
moh = mohclasses;
while(moh) {
if (moh->total_files)
moh_scan_files(moh);
moh = moh->next;
}
return 0;
}
int load_module(void) int load_module(void)
{ {
int res; int res;
load_moh_classes();
ast_install_music_functions(local_ast_moh_start, local_ast_moh_stop, local_ast_moh_cleanup); ast_install_music_functions(local_ast_moh_start, local_ast_moh_stop, local_ast_moh_cleanup);
res = ast_register_application(app0, moh0_exec, synopsis0, descrip0); res = ast_register_application(app0, moh0_exec, synopsis0, descrip0);
ast_register_atexit(ast_moh_destroy); ast_register_atexit(ast_moh_destroy);
@@ -999,19 +1008,12 @@ int load_module(void)
if (!res) if (!res)
res = ast_register_application(app2, moh2_exec, synopsis2, descrip2); res = ast_register_application(app2, moh2_exec, synopsis2, descrip2);
return res; return init_classes();
} }
int reload(void) int reload(void)
{ {
struct mohclass *moh = mohclasses; return init_classes();
load_moh_classes();
while(moh) {
if (moh->total_files)
moh_scan_files(moh);
moh = moh->next;
}
return 0;
} }