mirror of https://github.com/mpv-player/mpv
Default to the mixer device matching the audio device used for audio output.
That is, if the user redirects audio to /dev/sound/1 with the AUDIODEV environment variable, use /dev/sound/1ctl as the mixer device. When AUDIODEV is not set, the default for both devices is /dev/audio & /dev/audioctl. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5894 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
bd65848f56
commit
ee2ad20548
|
@ -43,7 +43,7 @@ LIBAO_EXTERN(sun)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static char *sun_mixer_device="/dev/audioctl";
|
static char *sun_mixer_device = NULL;
|
||||||
static char *audio_dev = NULL;
|
static char *audio_dev = NULL;
|
||||||
static int queued_bursts = 0;
|
static int queued_bursts = 0;
|
||||||
static int queued_samples = 0;
|
static int queued_samples = 0;
|
||||||
|
@ -261,14 +261,19 @@ static int init(int rate,int channels,int format,int flags){
|
||||||
audio_info_t info;
|
audio_info_t info;
|
||||||
int ok;
|
int ok;
|
||||||
|
|
||||||
if(mixer_device)
|
|
||||||
sun_mixer_device=mixer_device;
|
|
||||||
|
|
||||||
if (audio_dev == NULL) {
|
if (audio_dev == NULL) {
|
||||||
if ((audio_dev = getenv("AUDIODEV")) == NULL)
|
if ((audio_dev = getenv("AUDIODEV")) == NULL)
|
||||||
audio_dev = "/dev/audio";
|
audio_dev = "/dev/audio";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (sun_mixer_device == NULL) {
|
||||||
|
if ((sun_mixer_device = mixer_device) == NULL) {
|
||||||
|
sun_mixer_device = malloc(strlen(audio_dev) + 4);
|
||||||
|
strcpy(sun_mixer_device, audio_dev);
|
||||||
|
strcat(sun_mixer_device, "ctl");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (ao_subdevice) audio_dev = ao_subdevice;
|
if (ao_subdevice) audio_dev = ao_subdevice;
|
||||||
|
|
||||||
if (enable_sample_timing == RTSC_UNKNOWN
|
if (enable_sample_timing == RTSC_UNKNOWN
|
||||||
|
|
Loading…
Reference in New Issue