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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
$NetBSD: patch-ab,v 1.5 2006/06/30 03:16:38 joerg Exp $
--- gnome-cd/gst-cdrom.c.orig 2006-06-23 00:01:07.000000000 -0700
+++ gnome-cd/gst-cdrom.c
@@ -33,14 +33,14 @@
#ifdef __linux__
#include <linux/cdrom.h>
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
#include <sys/cdio.h>
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <sys/cdrio.h>
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCCAPABILITY
# define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT
#elif defined(__NetBSD__) || defined(__OpenBSD__)
@@ -844,7 +844,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
/*
GstCdparanoiaCDRom *lcd = GST_CDPARANOIA_CDROM (cdrom);
GstCdparanoiaCDRomPrivate *priv;
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
struct ioc_read_toc_single_entry tocentry;
#elif defined(__NetBSD__) || defined(__OpenBSD__)
struct ioc_read_toc_entry tocentries;
@@ -862,7 +862,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
return;
}
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) {
#else
if (ioctl (cdrom->fd, CDROMREADTOCHDR, priv->tochdr) < 0) {
@@ -873,7 +873,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
return;
}
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
priv->track0 = priv->tochdr->starting_track;
priv->track1 = priv->tochdr->ending_track;
#else
@@ -886,8 +886,8 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
priv->track_info =
g_malloc ((priv->number_tracks +
1) * sizeof (GstCdparanoiaCDRomTrackInfo));
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) {
tocentry.track = j;
tocentry.address_format = CD_MSF_FORMAT;
@@ -899,7 +899,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
tocentries.address_format = CD_MSF_FORMAT;
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
#else
if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
@@ -909,7 +909,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
}
priv->track_info[i].track = j;
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
priv->track_info[i].audio_track =
tocentry.entry.control != CDROM_DATA_TRACK ? 1 : 0;
ASSIGN_MSF (priv->track_info[i].address,
@@ -936,8 +936,8 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
tocentry.cdte_addr.msf);
#endif
}
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
tocentry.track = CDROM_LEADOUT;
tocentry.address_format = CD_MSF_FORMAT;
if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
@@ -950,7 +950,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
gst_cdparanoia_cdrom_invalidate (lcd);
return;
}
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
ASSIGN_MSF (priv->track_info[priv->number_tracks].address,
tocentry.entry.addr.msf);
#else
|
