summaryrefslogtreecommitdiff
path: root/multimedia/gstreamer-plugins80/files/patch-ext_cdparanoia_gstcdparanoia.c
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2005-07-06 15:04:58 +0000
committerKoop Mast <kwm@FreeBSD.org>2005-07-06 15:04:58 +0000
commit3f91498e6d7300a519650d17a3b481c1fe9242fe (patch)
treec76a2de71bc88a1a41241b6a82fc5243a9ee8714 /multimedia/gstreamer-plugins80/files/patch-ext_cdparanoia_gstcdparanoia.c
parentFix building with gcc 2.95. (diff)
Update to 0.8.10.
Wavpack moves from main package to stand alone plugin. New cdio plugin, spc plugin now enabled. Mark the cairo plugin ignore because it needs a newer version of cairo. Use gst-register-0.8 instead of gst-register. Changelog: http://gstreamer.freedesktop.org/releases/gst-plugins/0.8.10.html Approved by: maintainer (implicit)
Notes
Notes: svn path=/head/; revision=138594
Diffstat (limited to 'multimedia/gstreamer-plugins80/files/patch-ext_cdparanoia_gstcdparanoia.c')
-rw-r--r--multimedia/gstreamer-plugins80/files/patch-ext_cdparanoia_gstcdparanoia.c33
1 files changed, 29 insertions, 4 deletions
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_cdparanoia_gstcdparanoia.c b/multimedia/gstreamer-plugins80/files/patch-ext_cdparanoia_gstcdparanoia.c
index 17e8469ad897..b45d5baf4f91 100644
--- a/multimedia/gstreamer-plugins80/files/patch-ext_cdparanoia_gstcdparanoia.c
+++ b/multimedia/gstreamer-plugins80/files/patch-ext_cdparanoia_gstcdparanoia.c
@@ -1,6 +1,6 @@
---- ext/cdparanoia/gstcdparanoia.c.orig Fri Jun 3 06:59:43 2005
-+++ ext/cdparanoia/gstcdparanoia.c Fri Jun 3 07:00:13 2005
-@@ -561,6 +561,7 @@
+--- ext/cdparanoia/gstcdparanoia.c.orig Tue Jul 5 13:24:21 2005
++++ ext/cdparanoia/gstcdparanoia.c Tue Jul 5 13:24:27 2005
+@@ -562,6 +562,7 @@
gint16 *cdda_buf;
gint64 timestamp;
GstFormat format;
@@ -8,7 +8,7 @@
/* convert the sequence sector number to a timestamp */
format = GST_FORMAT_TIME;
-@@ -574,7 +575,6 @@
+@@ -575,7 +576,6 @@
gst_pad_convert (src->srcpad, sector_format,
get_relative (src, src->cur_track, src->cur_sector), &format,
&timestamp);
@@ -16,3 +16,28 @@
if (src->flush_pending) {
src->flush_pending = FALSE;
+@@ -790,7 +790,11 @@
+ if (src->d == NULL) {
+ GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
+ (_("Could not open CD device %s for reading."),
+- src->d->cdda_device_name), ("cdda_identify failed"));
++#if defined(__FreeBSD__)
++ src->d->dev->device_path), ("cdda_identify failed"));
++#else
++ src->d->cdda_device_name), ("cdda_identify failed"));
++#endif
+ return FALSE;
+ }
+
+@@ -807,7 +811,11 @@
+ if (cdda_open (src->d)) {
+ GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
+ (_("Could not open CD device %s for reading."),
++#if defined(__FreeBSD__)
++ src->d->dev->device_path), ("cdda_open failed"));
++#else
+ src->d->cdda_device_name), ("cdda_open failed"));
++#endif
+ cdda_close (src->d);
+ src->d = NULL;
+ return FALSE;