kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 19:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_musiconhold: Add option to loop last file.

Browse Source 
Adds the loop_last option to res_musiconhold,
which allows the last audio file in the directory
to be looped perpetually once reached, rather than
circling back to the beginning again.

Resolves: #122
ASTERISK-30462

UserNote: The loop_last option in musiconhold.conf now
allows the last file in the directory to be looped once reached.

(cherry picked from commit edf488c76e)
This commit is contained in:
Naveen Albert
2023-05-25 23:58:41 +00:00
committed by Asterisk Development Team
parent 457a72304d
commit 8cdf711531
3 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/res_musiconhold.c
View File

@@ -153,6 +153,8 @@ struct moh_files_state {
#define MOH_ANNOUNCEMENT (1 << 6) /*!< Do we play announcement files between songs on this channel? */
#define MOH_PREFERCHANNELCLASS (1 << 7) /*!< Should queue moh override channel moh */
#define MOH_LOOPLAST (1 << 8) /*!< Whether to loop the last file in the music class when we reach the end, rather than starting over */
/* Custom astobj2 flag */
#define MOH_NOTDELETED (1 << 30) /*!< Find only records that aren't deleted? */
#define MOH_REALTIME (1 << 31) /*!< Find only records that are realtime */
@@ -366,7 +368,11 @@ static int ast_moh_files_next(struct ast_channel *chan)
} else {
/* This is easy, just increment our position and make sure we don't exceed the total file count */
state->pos++;
state->pos %= file_count;
if (ast_test_flag(state->class, MOH_LOOPLAST)) {
state->pos = MIN(file_count - 1, state->pos);
} else {
state->pos %= file_count;
}
state->save_pos = -1;
state->samples = 0;
}
@@ -1172,6 +1178,12 @@ static void moh_parse_options(struct ast_variable *var, struct mohclass *mohclas
} else if (!strcasecmp(var->value, "randstart")) {
ast_set_flag(mohclass, MOH_RANDSTART);
}
} else if (!strcasecmp(var->name, "loop_last")) {
if (ast_true(var->value)) {
ast_set_flag(mohclass, MOH_LOOPLAST);
} else {
ast_clear_flag(mohclass, MOH_LOOPLAST);
}
} else if (!strcasecmp(var->name, "format") && !ast_strlen_zero(var->value)) {
ao2_cleanup(mohclass->format);
mohclass->format = ast_format_cache_get(var->value);