oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/alsa: move pcm_export_open() to caller

Browse Source 
Give the caller more control, prepare for DSD-over-USB improvements.
This commit is contained in:
Max Kellermann 2012-03-27 00:32:10 +02:00
parent a0730cf264
commit f6d6110aaa
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/output/alsa_output_plugin.c
View File

@ -385,7 +385,7 @@ alsa_output_setup_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
*/ */
static bool static bool
alsa_setup(struct alsa_data *ad, struct audio_format *audio_format, alsa_setup(struct alsa_data *ad, struct audio_format *audio_format,
GError **error) bool *packed_r, bool *reverse_endian_r, GError **error)
{ {
snd_pcm_hw_params_t *hwparams; snd_pcm_hw_params_t *hwparams;
snd_pcm_sw_params_t *swparams; snd_pcm_sw_params_t *swparams;
@ -429,9 +429,8 @@ configure_hw:
ad->writei = snd_pcm_writei; ad->writei = snd_pcm_writei;
} }
bool packed, reverse_endian;
err = alsa_output_setup_format(ad->pcm, hwparams, audio_format, err = alsa_output_setup_format(ad->pcm, hwparams, audio_format,
&packed, &reverse_endian); packed_r, reverse_endian_r);
if (err < 0) { if (err < 0) {
g_set_error(error, alsa_output_quark(), err, g_set_error(error, alsa_output_quark(), err,
"ALSA device \"%s\" does not support format %s: %s", "ALSA device \"%s\" does not support format %s: %s",
@ -578,9 +577,6 @@ configure_hw:
ad->period_frames = alsa_period_size; ad->period_frames = alsa_period_size;
ad->period_position = 0; ad->period_position = 0;
pcm_export_open(&ad->export, audio_format->format,
packed, reverse_endian);
return true; return true;
error: error:
@ -592,7 +588,7 @@ error:
static bool static bool
alsa_setup_dsd(struct alsa_data *ad, struct audio_format *audio_format, alsa_setup_dsd(struct alsa_data *ad, struct audio_format *audio_format,
GError **error_r) bool *packed_r, bool *reverse_endian_r, GError **error_r)
{ {
assert(ad->dsd_usb); assert(ad->dsd_usb);
assert(audio_format->format == SAMPLE_FORMAT_DSD); assert(audio_format->format == SAMPLE_FORMAT_DSD);
@ -604,7 +600,7 @@ alsa_setup_dsd(struct alsa_data *ad, struct audio_format *audio_format,
const struct audio_format check = *audio_format; const struct audio_format check = *audio_format;
if (!alsa_setup(ad, audio_format, error_r)) if (!alsa_setup(ad, audio_format, packed_r, reverse_endian_r, error_r))
return false; return false;
if (!audio_format_equals(audio_format, &check)) { if (!audio_format_equals(audio_format, &check)) {
@ -627,10 +623,19 @@ static bool
alsa_setup_or_dsd(struct alsa_data *ad, struct audio_format *audio_format, alsa_setup_or_dsd(struct alsa_data *ad, struct audio_format *audio_format,
GError **error_r) GError **error_r)
{ {
if (ad->dsd_usb && audio_format->format == SAMPLE_FORMAT_DSD) bool packed, reverse_endian;
return alsa_setup_dsd(ad, audio_format, error_r);
return alsa_setup(ad, audio_format, error_r); const bool success = ad->dsd_usb && audio_format->format == SAMPLE_FORMAT_DSD
? alsa_setup_dsd(ad, audio_format, &packed, &reverse_endian,
error_r)
: alsa_setup(ad, audio_format, &packed, &reverse_endian,
error_r);
if (!success)
return false;
pcm_export_open(&ad->export, audio_format->format,
packed, reverse_endian);
return true;
} }
static bool static bool