diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-17 05:58:34 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-17 05:58:34 +0800 |
| commit | fed3b4596bf8c0f4562474c65c6108c78bb67769 (patch) | |
| tree | 46cc205f920c902c55c51dec594cb044ecedcd5b /multimedia/gstreamer-plugins | |
| parent | d0b04672cf373cf4b8b87ff5dc87b52c16d0f4d6 (diff) | |
| download | marcuscom-ports-fed3b4596bf8c0f4562474c65c6108c78bb67769.tar marcuscom-ports-fed3b4596bf8c0f4562474c65c6108c78bb67769.tar.gz marcuscom-ports-fed3b4596bf8c0f4562474c65c6108c78bb67769.tar.bz2 marcuscom-ports-fed3b4596bf8c0f4562474c65c6108c78bb67769.tar.lz marcuscom-ports-fed3b4596bf8c0f4562474c65c6108c78bb67769.tar.xz marcuscom-ports-fed3b4596bf8c0f4562474c65c6108c78bb67769.tar.zst marcuscom-ports-fed3b4596bf8c0f4562474c65c6108c78bb67769.zip | |
Allow the enhanced mixer_info to work on -CURRENT where it's supported.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1337 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia/gstreamer-plugins')
| -rw-r--r-- | multimedia/gstreamer-plugins/files/patch-sys_oss_gstossmixer.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_oss_gstossmixer.c b/multimedia/gstreamer-plugins/files/patch-sys_oss_gstossmixer.c index 99885064d..4589040e5 100644 --- a/multimedia/gstreamer-plugins/files/patch-sys_oss_gstossmixer.c +++ b/multimedia/gstreamer-plugins/files/patch-sys_oss_gstossmixer.c @@ -1,21 +1,26 @@ ---- sys/oss/gstossmixer.c.orig Sat Nov 15 02:02:25 2003 -+++ sys/oss/gstossmixer.c Sat Nov 15 02:10:18 2003 -@@ -399,7 +399,6 @@ +--- sys/oss/gstossmixer.c.orig Sun Nov 16 13:43:53 2003 ++++ sys/oss/gstossmixer.c Sun Nov 16 16:57:37 2003 +@@ -399,7 +399,9 @@ gint i, devmask; const GList *pads = gst_element_get_pad_list (GST_ELEMENT (oss)); GstPadDirection dir = GST_PAD_UNKNOWN; -- struct mixer_info minfo; ++#ifdef SOUND_MIXER_INFO + struct mixer_info minfo; ++#endif g_return_if_fail (oss->mixer_fd == -1); -@@ -428,9 +427,7 @@ +@@ -428,9 +430,13 @@ } /* get name */ -- if (ioctl (oss->mixer_fd, SOUND_MIXER_INFO, &minfo) == 0) { -- oss->device_name = g_strdup (minfo.name); -- } ++#ifdef SOUND_MIXER_INFO + if (ioctl (oss->mixer_fd, SOUND_MIXER_INFO, &minfo) == 0) { + oss->device_name = g_strdup (minfo.name); + } ++#else + oss->device_name = g_strdup ("FreeBSD Mixer"); ++#endif /* build track list */ for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { |