diff options
author | (no author) <(no author)@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-15 05:59:50 +0800 |
---|---|---|
committer | (no author) <(no author)@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-15 05:59:50 +0800 |
commit | 73cb2357a7c7f905403cf41592bcbd7286fd85ae (patch) | |
tree | 2f5e26903a1f136a9e2f54af42475b280a215a6d /multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h | |
parent | fd170dfee433454a5e1f74c295bf23f3835894c0 (diff) | |
download | marcuscom-ports-73cb2357a7c7f905403cf41592bcbd7286fd85ae.tar marcuscom-ports-73cb2357a7c7f905403cf41592bcbd7286fd85ae.tar.gz marcuscom-ports-73cb2357a7c7f905403cf41592bcbd7286fd85ae.tar.bz2 marcuscom-ports-73cb2357a7c7f905403cf41592bcbd7286fd85ae.tar.lz marcuscom-ports-73cb2357a7c7f905403cf41592bcbd7286fd85ae.tar.xz marcuscom-ports-73cb2357a7c7f905403cf41592bcbd7286fd85ae.tar.zst marcuscom-ports-73cb2357a7c7f905403cf41592bcbd7286fd85ae.zip |
This commit was manufactured by cvs2svn to create branch 'GNOME_2_6'.GNOME_2_6
git-svn-id: svn://creme-brulee.marcuscom.com/ports/branches/GNOME_2_6@2058 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h')
-rw-r--r-- | multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h deleted file mode 100644 index daaefac5e..000000000 --- a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h +++ /dev/null @@ -1,72 +0,0 @@ ---- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 1 06:52:03 2004 -+++ sys/cdrom/gstcdplayer_ioctl_bsd.h Tue Mar 9 16:05:36 2004 -@@ -142,6 +142,7 @@ - { - struct ioc_toc_header toc_header; - struct ioc_read_toc_entry toc_entry; -+ struct cd_toc_entry toc_entry_data; - guint i; - - cd->fd = open(device,O_RDONLY | O_NONBLOCK); -@@ -151,7 +152,7 @@ - } - - /* get the toc header information */ -- if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) { -+ if (ioctl(cd->fd,CDIOREADTOCHEADER,&toc_header) != 0) { - close(cd->fd); - cd->fd = -1; - return FALSE; -@@ -161,6 +162,8 @@ - for (i = 1; i <= toc_header.ending_track; i++) { - toc_entry.address_format = CD_MSF_FORMAT; - toc_entry.starting_track = i; -+ toc_entry.data = &toc_entry_data; -+ toc_entry.data_len = sizeof(toc_entry_data); - - if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { - close(cd->fd); -@@ -168,9 +171,9 @@ - return FALSE; - } - -- cd->tracks[i].minute = toc_entry.entry.addr.msf.minute; -- cd->tracks[i].second = toc_entry.entry.addr.msf.second; -- cd->tracks[i].frame = toc_entry.entry.addr.msf.frame; -+ cd->tracks[i].minute = toc_entry.data->addr.msf.minute; -+ cd->tracks[i].second = toc_entry.data->addr.msf.second; -+ cd->tracks[i].frame = toc_entry.data->addr.msf.frame; - cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; - } - -@@ -186,9 +189,9 @@ - return FALSE; - } - -- cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute; -- cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second; -- cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame; -+ cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute; -+ cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second; -+ cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame; - - cd->num_tracks = toc_header.ending_track; - -@@ -224,6 +227,8 @@ - return FALSE; - } - -+ /* lets return TRUE and lets see what happes (may not be correct)*/ -+ return TRUE; - } - - gboolean cd_pause(struct cd *cd) -@@ -321,7 +326,7 @@ - return -1; - } - --#ifdef __NetBSD__ -+#if defined(__NetBSD__) || defined(__FreeBSD__) - return sub_channel.data->what.track_info.track_number; - #else - return sub_channel.data->track_number; |