diff options
| author | David Schleef <ds@schleef.org> | 2004-02-27 23:36:43 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-02-27 23:36:43 +0000 |
| commit | 603eae54ad357c7304acaea71a2e54a123fa7162 (patch) | |
| tree | 16b286da65dcb5ea85201e52486980bddc27186c | |
| parent | 0bad4023f0be4da5fac060160f2c207f3e8427f5 (diff) | |
| download | gst-plugins-bad-603eae54ad357c7304acaea71a2e54a123fa7162.tar.gz gst-plugins-bad-603eae54ad357c7304acaea71a2e54a123fa7162.tar.bz2 gst-plugins-bad-603eae54ad357c7304acaea71a2e54a123fa7162.zip | |
patches from jmmv@menta.net (Julio M. Merino Vidal)
Original commit message from CVS:
patches from jmmv@menta.net (Julio M. Merino Vidal)
* gst/interleave/deinterleave.c: (deinterleave_chain): Fix
GST_ELEMENT_ERROR call (bug #135634)
* gst/interleave/interleave.c: (interleave_buffered_loop),
(interleave_bytestream_loop): Don't use alloca() (bug #135640)
* sys/cdrom/gstcdplayer_ioctl_bsd.h: Fix ioctls on NetBSD (bug #135645)
* sys/oss/gstosssink.c: (gst_osssink_get_delay),
(gst_osssink_chain): Fix ioctls on NetBSD. (bug #135644)
* sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_sync_next_frame),
(gst_v4lmjpegsrc_set_capture), (gst_v4lmjpegsrc_set_capture_m),
(gst_v4lmjpegsrc_capture_init), (gst_v4lmjpegsrc_requeue_frame):
Fix GST_ELEMENT_ERROR call.
* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_try_palette): Fix
GST_ELEMENT_ERROR call.
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | sys/cdrom/gstcdplayer_ioctl_bsd.h | 7 |
2 files changed, 25 insertions, 0 deletions
@@ -1,3 +1,21 @@ +2004-02-27 David Schleef <ds@schleef.org> + + patches from jmmv@menta.net (Julio M. Merino Vidal) + + * gst/interleave/deinterleave.c: (deinterleave_chain): Fix + GST_ELEMENT_ERROR call (bug #135634) + * gst/interleave/interleave.c: (interleave_buffered_loop), + (interleave_bytestream_loop): Don't use alloca() (bug #135640) + * sys/cdrom/gstcdplayer_ioctl_bsd.h: Fix ioctls on NetBSD (bug #135645) + * sys/oss/gstosssink.c: (gst_osssink_get_delay), + (gst_osssink_chain): Fix ioctls on NetBSD. (bug #135644) + * sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_sync_next_frame), + (gst_v4lmjpegsrc_set_capture), (gst_v4lmjpegsrc_set_capture_m), + (gst_v4lmjpegsrc_capture_init), (gst_v4lmjpegsrc_requeue_frame): + Fix GST_ELEMENT_ERROR call. + * sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_try_palette): Fix + GST_ELEMENT_ERROR call. + 2004-02-27 Benjamin Otte <otte@gnome.org> * gst-libs/gst/audio/audio.h: diff --git a/sys/cdrom/gstcdplayer_ioctl_bsd.h b/sys/cdrom/gstcdplayer_ioctl_bsd.h index 371c1300..f8a94cd7 100644 --- a/sys/cdrom/gstcdplayer_ioctl_bsd.h +++ b/sys/cdrom/gstcdplayer_ioctl_bsd.h @@ -18,6 +18,9 @@ */ #ifdef HAVE_CDROM_BSD_NETBSD /* net & open */ +#ifndef CDIOREADTOCHDR +#define CDIOREADTOCHDR CDIOREADTOCHEADER +#endif gboolean cd_init(struct cd *cd,const gchar *device) { struct ioc_toc_header toc_header; @@ -318,7 +321,11 @@ gint cd_current_track(struct cd *cd) return -1; } +#ifdef __NetBSD__ + return sub_channel.data->what.track_info.track_number; +#else return sub_channel.data->track_number; +#endif } gboolean cd_close(struct cd *cd) |