Skip to content

M
mpd
Commit 8397196f authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/alsa: change a few "dsd" to "dop"

parent 85476114
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/output/plugins/AlsaOutputPlugin.cxx
View file @ 8397196f
...@@ -636,7 +636,7 @@ error: ...@@ -636,7 +636,7 @@ error:
} }
static bool static bool
alsa_setup_dsd(AlsaOutput *ad, const AudioFormat audio_format, alsa_setup_dop(AlsaOutput *ad, const AudioFormat audio_format,
bool *shift8_r, bool *packed_r, bool *reverse_endian_r, bool *shift8_r, bool *packed_r, bool *reverse_endian_r,
Error &error) Error &error)
{ {
...@@ -677,7 +677,7 @@ alsa_setup_dsd(AlsaOutput *ad, const AudioFormat audio_format, ...@@ -677,7 +677,7 @@ alsa_setup_dsd(AlsaOutput *ad, const AudioFormat audio_format,
} }
static bool static bool
alsa_setup_or_dsd(AlsaOutput *ad, AudioFormat &audio_format, alsa_setup_or_dop(AlsaOutput *ad, AudioFormat &audio_format,
Error &error) Error &error)
{ {
bool shift8 = false, packed, reverse_endian; bool shift8 = false, packed, reverse_endian;
...@@ -685,7 +685,7 @@ alsa_setup_or_dsd(AlsaOutput *ad, AudioFormat &audio_format, ...@@ -685,7 +685,7 @@ alsa_setup_or_dsd(AlsaOutput *ad, AudioFormat &audio_format,
const bool dop = ad->dop && const bool dop = ad->dop &&
audio_format.format == SampleFormat::DSD; audio_format.format == SampleFormat::DSD;
const bool success = dop const bool success = dop
? alsa_setup_dsd(ad, audio_format, ? alsa_setup_dop(ad, audio_format,
&shift8, &packed, &reverse_endian, &shift8, &packed, &reverse_endian,
error) error)
: alsa_setup(ad, audio_format, &packed, &reverse_endian, : alsa_setup(ad, audio_format, &packed, &reverse_endian,
...@@ -717,7 +717,7 @@ alsa_open(AudioOutput *ao, AudioFormat &audio_format, Error &error) ...@@ -717,7 +717,7 @@ alsa_open(AudioOutput *ao, AudioFormat &audio_format, Error &error)
snd_pcm_name(ad->pcm), snd_pcm_name(ad->pcm),
snd_pcm_type_name(snd_pcm_type(ad->pcm))); snd_pcm_type_name(snd_pcm_type(ad->pcm)));
if (!alsa_setup_or_dsd(ad, audio_format, error)) { if (!alsa_setup_or_dop(ad, audio_format, error)) {
snd_pcm_close(ad->pcm); snd_pcm_close(ad->pcm);
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment