diff options
| author | pav <pav@FreeBSD.org> | 2005-07-11 20:46:15 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2005-07-11 20:46:15 +0800 |
| commit | 500af056e21734e9f82ff83dc1c4b350b6233fd0 (patch) | |
| tree | 643a59cd52f24fb9e19df584e510449648bc5e3d /multimedia/gstreamer-plugins | |
| parent | 30551fbeea7e9253686cef7ba76c98050b9fcecd (diff) | |
| download | freebsd-ports-gnome-500af056e21734e9f82ff83dc1c4b350b6233fd0.tar.gz freebsd-ports-gnome-500af056e21734e9f82ff83dc1c4b350b6233fd0.tar.zst freebsd-ports-gnome-500af056e21734e9f82ff83dc1c4b350b6233fd0.zip | |
- Fix compilation of audio/gstreamer-plugins-cdparanoia on FreeBSD 4.X
Approved by: kwm
Diffstat (limited to 'multimedia/gstreamer-plugins')
| -rw-r--r-- | multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c b/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c index b45d5baf4f91..a53b67028709 100644 --- a/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c +++ b/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c @@ -1,5 +1,5 @@ ---- ext/cdparanoia/gstcdparanoia.c.orig Tue Jul 5 13:24:21 2005 -+++ ext/cdparanoia/gstcdparanoia.c Tue Jul 5 13:24:27 2005 +--- ext/cdparanoia/gstcdparanoia.c.orig Mon Jul 11 14:36:25 2005 ++++ ext/cdparanoia/gstcdparanoia.c Mon Jul 11 14:38:41 2005 @@ -562,6 +562,7 @@ gint16 *cdda_buf; gint64 timestamp; @@ -16,26 +16,34 @@ if (src->flush_pending) { src->flush_pending = FALSE; -@@ -790,7 +790,11 @@ +@@ -788,9 +788,15 @@ + + /* fail if the device couldn't be found */ if (src->d == NULL) { ++#if defined(__FreeBSD__) 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 ++ GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, ++ (_("Could not open CD device %s for reading."), + src->d->cdda_device_name), ("cdda_identify failed")); +#endif return FALSE; } -@@ -807,7 +811,11 @@ +@@ -805,9 +811,15 @@ + + /* open the disc */ if (cdda_open (src->d)) { - GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, - (_("Could not open CD device %s for reading."), +#if defined(__FreeBSD__) ++ GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, ++ (_("Could not open CD device %s for reading."), + src->d->dev->device_path), ("cdda_open failed")); +#else + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, + (_("Could not open CD device %s for reading."), src->d->cdda_device_name), ("cdda_open failed")); +#endif cdda_close (src->d); |