Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
asterisk
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Voice
asterisk
Commits
5929e0cc
Commit
5929e0cc
authored
4 years ago
by
Sean Bright
Committed by
George Joseph
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
res_musiconhold: Clarify that playlist mode only supports HTTP(S) URLs
Change-Id: I41e77a04e4a523f4ed61a7a20b738ffd42be441e
parent
9b08eddf
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configs/samples/musiconhold.conf.sample
+2
-2
2 additions, 2 deletions
configs/samples/musiconhold.conf.sample
res/res_musiconhold.c
+1
-1
1 addition, 1 deletion
res/res_musiconhold.c
with
3 additions
and
3 deletions
configs/samples/musiconhold.conf.sample
+
2
−
2
View file @
5929e0cc
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; valid mode options:
; valid mode options:
; files -- read files from a directory in any Asterisk supported
; files -- read files from a directory in any Asterisk supported
; media format
; media format
; playlist -- provide a fixed list of filenames or URLs to play
; playlist -- provide a fixed list of filenames or
HTTP(S)
URLs to play
; quietmp3 -- default
; quietmp3 -- default
; mp3 -- loud
; mp3 -- loud
; mp3nb -- unbuffered
; mp3nb -- unbuffered
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
; Each entry must be one of:
; Each entry must be one of:
;
;
; * An absolute path to the file to be played, without an extension.
; * An absolute path to the file to be played, without an extension.
; * A URL
; * A
n HTTP(S)
URL
;
;
; The entries are played in the order in which they appear in the
; The entries are played in the order in which they appear in the
; configuration. The 'sort' option is not used for this mode.
; configuration. The 'sort' option is not used for this mode.
...
...
This diff is collapsed.
Click to expand it.
res/res_musiconhold.c
+
1
−
1
View file @
5929e0cc
...
@@ -1144,7 +1144,7 @@ static void moh_parse_options(struct ast_variable *var, struct mohclass *mohclas
...
@@ -1144,7 +1144,7 @@ static void moh_parse_options(struct ast_variable *var, struct mohclass *mohclas
AST_VECTOR_APPEND
(
playlist_entries
,
dup
);
AST_VECTOR_APPEND
(
playlist_entries
,
dup
);
}
else
{
}
else
{
ast_log
(
LOG_ERROR
,
"Playlist entries must be a URL or absolute path, '%s' provided.
\n
"
,
var
->
value
);
ast_log
(
LOG_ERROR
,
"Playlist entries must be a
n HTTP(S)
URL or absolute path, '%s' provided.
\n
"
,
var
->
value
);
}
}
}
else
if
(
!
strcasecmp
(
var
->
name
,
"directory"
))
{
}
else
if
(
!
strcasecmp
(
var
->
name
,
"directory"
))
{
ast_copy_string
(
mohclass
->
dir
,
var
->
value
,
sizeof
(
mohclass
->
dir
));
ast_copy_string
(
mohclass
->
dir
,
var
->
value
,
sizeof
(
mohclass
->
dir
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment