Commit 7a19c0b4 authored by Rafaël Carré's avatar Rafaël Carré

alsa: set spdif options also if device was specified

On my laptop I need to specify --alsa-audio-device hdmi
parent 806a5a50
...@@ -327,7 +327,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -327,7 +327,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
const char *device = sys->device; const char *device = sys->device;
char *devbuf = NULL; char *devbuf = NULL;
/* Choose the IEC device for S/PDIF output */ /* Choose the IEC device for S/PDIF output */
if (spdif && !strcmp (device, "default")) if (spdif)
{ {
unsigned aes3; unsigned aes3;
...@@ -345,8 +345,23 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -345,8 +345,23 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
break; break;
} }
char *opt = NULL;
if (!strcmp (device, "default"))
device = "iec958"; /* TODO: hdmi */
else
{
opt = strchr(device, ':');
if (opt && opt[1] == '\0') {
/* if device is terminated by : but there's no options,
* remove ':', we'll add it back in the format string. */
*opt = '\0';
opt = NULL;
}
}
if (asprintf (&devbuf, if (asprintf (&devbuf,
"iec958:AES0=0x%x,AES1=0x%x,AES2=0x%x,AES3=0x%x", "%s%cAES0=0x%x,AES1=0x%x,AES2=0x%x,AES3=0x%x", device,
opt ? ',' : ':',
IEC958_AES0_CON_EMPHASIS_NONE | IEC958_AES0_NONAUDIO, IEC958_AES0_CON_EMPHASIS_NONE | IEC958_AES0_NONAUDIO,
IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER, IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER,
0, aes3) == -1) 0, aes3) == -1)
......
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