summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authoral3x <al3x@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-06-23 18:59:54 +0000
committeral3x <al3x@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-06-23 18:59:54 +0000
commitd39f5c596228b113c328e6e8304b07d1c7a77459 (patch)
treea0e1d9d44bbd9d16d6f6032e5b7c807bf305dbf8 /libao2
parent517707c56b50489770921ed5d4d685df8363d956 (diff)
downloadmpv-d39f5c596228b113c328e6e8304b07d1c7a77459.tar.bz2
mpv-d39f5c596228b113c328e6e8304b07d1c7a77459.tar.xz
ao_subdevice support added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1208 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_alsa1x.c3
-rw-r--r--libao2/ao_alsa9.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/libao2/ao_alsa1x.c b/libao2/ao_alsa1x.c
index 6764068ae7..41eae11038 100644
--- a/libao2/ao_alsa1x.c
+++ b/libao2/ao_alsa1x.c
@@ -155,6 +155,9 @@ static int init(int rate_hz, int channels, int format, int flags)
return(0);
}
+ if (ao_subdevice != NULL)
+ alsa_device = ao_subdevice;
+
if (alsa_device == NULL)
{
if ((alsa_device = malloc(ALSA_DEVICE_SIZE)) == NULL)
diff --git a/libao2/ao_alsa9.c b/libao2/ao_alsa9.c
index 6764068ae7..41eae11038 100644
--- a/libao2/ao_alsa9.c
+++ b/libao2/ao_alsa9.c
@@ -155,6 +155,9 @@ static int init(int rate_hz, int channels, int format, int flags)
return(0);
}
+ if (ao_subdevice != NULL)
+ alsa_device = ao_subdevice;
+
if (alsa_device == NULL)
{
if ((alsa_device = malloc(ALSA_DEVICE_SIZE)) == NULL)