mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

Only use S/PDIF output when no other alsa device is set, allows to use

Browse Source 
external ac3 decoders.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13662 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-10-17 20:03:55 +00:00
parent 69a5c44698
commit efeaeab3c4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCS/man/en/mplayer.1
View File

@ -1752,6 +1752,8 @@ Sets noblock-mode.
.IPs device=<device>
Sets the device name.
Replace any ',' with '.' and any ':' with '=' in the ALSA device name.
Make sure you do not set this when you want hwac3 output via S/PDIF, unless
you really know how to set it correctly.
.RE
.PD 1
.

7
libao2/ao_alsa.c
View File

@ -405,6 +405,7 @@ static int init(int rate_hz, int channels, int format, int flags)
}
}
if (!device_set) {
/* switch for spdif
* sets opening sequence for SPDIF
* sets also the playback and other switches 'on the fly'
@ -430,24 +431,21 @@ static int init(int rate_hz, int channels, int format, int flags)
s[0], s[1], s[2], s[3]);
mp_msg(MSGT_AO,MSGL_V,"alsa-spdif-init: playing AC3, %i channels\n", channels);
device_set = 1;
break;
case 4:
strncpy(alsa_device, "surround40", ALSA_DEVICE_SIZE);
device_set = 1;
break;
case 6:
strncpy(alsa_device, "surround51", ALSA_DEVICE_SIZE);
device_set = 1;
break;
default:
mp_msg(MSGT_AO,MSGL_ERR,"alsa-spdif-init: %d channels are not supported\n", channels);
}
}
else
if (!device_set)
{
int tmp_device, tmp_subdevice, err;
@ -474,6 +472,7 @@ static int init(int rate_hz, int channels, int format, int flags)
}
mp_msg(MSGT_AO,MSGL_INFO,"alsa-init: %d soundcard%s found, using: %s\n", cards+1,(cards >= 0) ? "" : "s", alsa_device);
}
} else {
mp_msg(MSGT_AO,MSGL_INFO,"alsa-init: soundcard set to %s\n", alsa_device);
}