blob: dee1aa98903d8f5d3755eb3b630739bec0e75515 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
--- gnome-cd/gst-cdrom.c.orig Mon Jan 22 09:01:38 2007
+++ gnome-cd/gst-cdrom.c Mon Feb 12 15:59:18 2007
@@ -44,13 +44,17 @@
#endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCCAPABILITY
+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCGETVOL
+struct ioc_vol vol_value;
+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR &vol_value
# define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT
#elif defined(__NetBSD__) || defined(__OpenBSD__)
# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCGETVOL
+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR 0
# define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT
#else
# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDROM_GET_CAPABILITY
+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR 0
# define GST_CDROM_IOCTL_EJECT_REQUEST CDROMEJECT
#endif
@@ -190,7 +194,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom *
#ifdef __sun
res = TRUE;
#else
- if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, 0) >= 0) {
+ if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR) >= 0) {
res = TRUE;
} else {
GST_DEBUG ("ioctl() failed: %s", g_strerror (errno));
|