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
2219e691
Commit
2219e691
authored
May 29, 2005
by
Warren Dukes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
forgot to parse the format string of audio_output's
git-svn-id:
https://svn.musicpd.org/mpd/trunk@3296
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
986a0ffc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
11 deletions
+14
-11
audioOutput.c
src/audioOutput.c
+14
-11
No files found.
src/audioOutput.c
View file @
2219e691
...
...
@@ -54,6 +54,7 @@ AudioOutput * newAudioOutput(ConfigParam * param) {
if
(
param
)
{
getBlockParam
(
AUDIO_OUTPUT_NAME
,
name
,
1
);
getBlockParam
(
AUDIO_OUTPUT_TYPE
,
type
,
1
);
getBlockParam
(
AUDIO_OUTPUT_FORMAT
,
format
,
1
);
if
(
!
findInList
(
audioOutputPluginList
,
type
,
&
data
))
{
ERROR
(
"couldn't find audio output plugin for type "
...
...
@@ -63,17 +64,6 @@ AudioOutput * newAudioOutput(ConfigParam * param) {
}
plugin
=
(
AudioOutputPlugin
*
)
data
;
if
(
format
)
{
ret
->
convertAudioFormat
=
1
;
if
(
0
!=
parseAudioConfig
(
&
ret
->
reqAudioFormat
,
format
))
{
ERROR
(
"error parsing format at line %i
\n
"
,
bp
->
line
);
exit
(
EXIT_FAILURE
);
}
}
}
else
{
ListNode
*
node
=
audioOutputPluginList
->
firstNode
;
...
...
@@ -126,6 +116,19 @@ AudioOutput * newAudioOutput(ConfigParam * param) {
memset
(
&
ret
->
outAudioFormat
,
0
,
sizeof
(
AudioFormat
));
memset
(
&
ret
->
reqAudioFormat
,
0
,
sizeof
(
AudioFormat
));
if
(
format
)
{
ret
->
convertAudioFormat
=
1
;
if
(
0
!=
parseAudioConfig
(
&
ret
->
reqAudioFormat
,
format
))
{
ERROR
(
"error parsing format at line %i
\n
"
,
bp
->
line
);
exit
(
EXIT_FAILURE
);
}
copyAudioFormat
(
&
ret
->
outAudioFormat
,
&
ret
->
reqAudioFormat
);
}
if
(
plugin
->
initDriverFunc
(
ret
,
param
)
!=
0
)
{
free
(
ret
);
ret
=
NULL
;
...
...
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