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
92f54f0b
Commit
92f54f0b
authored
Feb 28, 2016
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/alsa: disable DoP if it fails
See
http://bugs.musicpd.org/view.php?id=4496
parent
ddce544b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
NEWS
NEWS
+1
-0
AlsaOutputPlugin.cxx
src/output/plugins/AlsaOutputPlugin.cxx
+15
-3
No files found.
NEWS
View file @
92f54f0b
...
...
@@ -31,6 +31,7 @@ ver 0.20 (not yet released)
- alsa: fix multi-channel order
- alsa: remove option "use_mmap"
- alsa: support DSD_U32
- alsa: disable DoP if it fails
- jack: reduce CPU usage
- pulse: set channel map to WAVE-EX
- recorder: record tags
...
...
src/output/plugins/AlsaOutputPlugin.cxx
View file @
92f54f0b
...
...
@@ -731,13 +731,25 @@ AlsaOutput::SetupOrDop(AudioFormat &audio_format, PcmExport::Params ¶ms,
Error
&
error
)
{
#ifdef ENABLE_DSD
if
(
dop
&&
audio_format
.
format
==
SampleFormat
::
DSD
)
{
Error
dop_error
;
if
(
dop
&&
audio_format
.
format
==
SampleFormat
::
DSD
&&
SetupDop
(
audio_format
,
params
,
dop_error
))
{
params
.
dop
=
true
;
return
SetupDop
(
audio_format
,
params
,
error
)
;
return
true
;
}
#endif
return
AlsaSetup
(
this
,
audio_format
,
params
,
error
);
if
(
AlsaSetup
(
this
,
audio_format
,
params
,
error
))
return
true
;
#ifdef ENABLE_DSD
if
(
dop_error
.
IsDefined
())
/* if DoP was attempted, prefer returning the original
DoP error instead of the fallback error */
error
=
std
::
move
(
dop_error
);
#endif
return
false
;
}
inline
bool
...
...
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