Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
83aed705
Commit
83aed705
authored
Jul 29, 2016
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/shout: rename "encoding" to "encoder"
The user manual specifies "encoder", which is consistent with other output plugins. "encoding" should be deprecated.
parent
77c6e45e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
NEWS
NEWS
+2
-0
mpdconf.example
doc/mpdconf.example
+1
-1
ShoutOutputPlugin.cxx
src/output/plugins/ShoutOutputPlugin.cxx
+3
-1
No files found.
NEWS
View file @
83aed705
...
...
@@ -3,6 +3,8 @@ ver 0.19.18 (not yet released)
- ffmpeg: fix crash with older FFmpeg versions (< 3.0)
- ffmpeg: log detailed error message
- ffmpeg: support FFmpeg 3.1
* output
- shout: recognize setting "encoder" instead of "encoding"
* require gcc 4.7 or newer
ver 0.19.17 (2016/07/09)
...
...
doc/mpdconf.example
View file @
83aed705
...
...
@@ -231,7 +231,7 @@ input {
#
#audio_output {
# type "shout"
# encod
ing "ogg"
# optional
# encod
er "vorbis"
# optional
# name "My Shout Stream"
# host "localhost"
# port "8000"
...
...
src/output/plugins/ShoutOutputPlugin.cxx
View file @
83aed705
...
...
@@ -164,7 +164,9 @@ ShoutOutput::Configure(const config_param ¶m, Error &error)
}
}
const
char
*
encoding
=
param
.
GetBlockValue
(
"encoding"
,
"ogg"
);
const
char
*
encoding
=
param
.
GetBlockValue
(
"encoder"
,
nullptr
);
if
(
encoding
==
nullptr
)
encoding
=
param
.
GetBlockValue
(
"encoding"
,
"vorbis"
);
const
auto
encoder_plugin
=
shout_encoder_plugin_get
(
encoding
);
if
(
encoder_plugin
==
nullptr
)
{
error
.
Format
(
config_domain
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment