From 03caa97b73186756d200772536cb1ef441ddcff3 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 29 Jan 2004 23:20:45 +0000 Subject: [PATCH] GST_ELEMENT_ERROR Original commit message from CVS: GST_ELEMENT_ERROR --- ChangeLog | 5 ++++ ext/alsa/gstalsa.c | 6 ++--- ext/alsa/gstalsasink.c | 2 +- ext/alsa/gstalsasrc.c | 2 +- ext/gnomevfs/gstgnomevfssink.c | 4 +-- ext/gnomevfs/gstgnomevfssrc.c | 8 +++--- ext/ogg/gstoggdemux.c | 10 +++---- ext/vorbis/vorbisdec.c | 8 +++--- ext/vorbis/vorbisenc.c | 2 +- ext/vorbis/vorbisfile.c | 2 +- gst-libs/gst/riff/riff-read.c | 16 ++++++------ gst/adder/gstadder.c | 8 +++--- gst/sine/gstsinesrc.c | 2 +- gst/tags/gstvorbistag.c | 4 +-- gst/videotestsrc/gstvideotestsrc.c | 2 +- sys/v4l/gstv4lmjpegsink.c | 2 +- sys/v4l/gstv4lmjpegsrc.c | 2 +- sys/v4l/gstv4lsrc.c | 2 +- sys/v4l/v4l-overlay_calls.c | 8 +++--- sys/v4l/v4l_calls.c | 42 +++++++++++++++--------------- sys/v4l/v4l_calls.h | 10 +++---- sys/v4l/v4lmjpegsink_calls.c | 24 ++++++++--------- sys/v4l/v4lmjpegsrc_calls.c | 28 ++++++++++---------- sys/v4l/v4lsrc_calls.c | 20 +++++++------- sys/ximage/ximagesink.c | 4 +-- sys/xvimage/xvimagesink.c | 4 +-- 26 files changed, 116 insertions(+), 111 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9132bbabdd..faabab4814 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-01-30 Thomas Vander Stichele + + * just about every source file: + gst_element_error -> GST_ELEMENT_ERROR + 2004-01-29 Julien MOUTTE * ext/gnomevfs/gstgnomevfssrc.c: (gst_gnomevfssrc_get): Fixing seeking diff --git a/ext/alsa/gstalsa.c b/ext/alsa/gstalsa.c index 4016ad2c4c..b41765bc91 100644 --- a/ext/alsa/gstalsa.c +++ b/ext/alsa/gstalsa.c @@ -658,7 +658,7 @@ gst_alsa_link (GstPad *pad, const GstCaps *caps) GstCaps *old = gst_alsa_caps (this->format->format, this->format->rate, this->format->channels); for (--i; i >= 0; i--) { if (gst_pad_try_set_caps (this->pad[i], old) == GST_PAD_LINK_REFUSED) { - gst_element_error (this, CORE, NEGOTIATION, NULL, + GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL, ("could not reset caps to a sane value")); gst_caps_free (old); break; @@ -680,7 +680,7 @@ gst_alsa_link (GstPad *pad, const GstCaps *caps) g_free (this->format); this->format = format; if (! gst_alsa_start_audio (this)) { - gst_element_error (this, RESOURCE, SETTINGS, NULL, NULL); + GST_ELEMENT_ERROR (this, RESOURCE, SETTINGS, NULL, NULL); return GST_PAD_LINK_REFUSED; } @@ -873,7 +873,7 @@ gst_alsa_xrun_recovery (GstAlsa *this) } if (!(gst_alsa_stop_audio (this) && gst_alsa_start_audio (this))) { - gst_element_error (this, RESOURCE, FAILED, NULL, + GST_ELEMENT_ERROR (this, RESOURCE, FAILED, NULL, ("Error restarting audio after xrun")); } } diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c index d6160a71fe..3c205cf06c 100644 --- a/ext/alsa/gstalsasink.c +++ b/ext/alsa/gstalsasink.c @@ -342,7 +342,7 @@ sink_restart: } /* caps nego failed somewhere */ if (this->format == NULL) { - gst_element_error (this, CORE, NEGOTIATION, NULL, + GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL, ("ALSA format not negotiated")); } samplestamp = gst_alsa_timestamp_to_samples (this, GST_BUFFER_TIMESTAMP (sink->buf[i])); diff --git a/ext/alsa/gstalsasrc.c b/ext/alsa/gstalsasrc.c index 273ba9b2e9..d7f28a7aa7 100644 --- a/ext/alsa/gstalsasrc.c +++ b/ext/alsa/gstalsasrc.c @@ -311,7 +311,7 @@ gst_alsa_src_loop (GstElement *element) /* set the caps on all pads */ if (!this->format) { if (!gst_alsa_src_set_caps (src, FALSE)) { - gst_element_error (element, CORE, NEGOTIATION, NULL, + GST_ELEMENT_ERROR (element, CORE, NEGOTIATION, NULL, ("ALSA format not negotiated")); return; } diff --git a/ext/gnomevfs/gstgnomevfssink.c b/ext/gnomevfs/gstgnomevfssink.c index 7b6758aaf6..e28e0a7396 100644 --- a/ext/gnomevfs/gstgnomevfssink.c +++ b/ext/gnomevfs/gstgnomevfssink.c @@ -282,7 +282,7 @@ gst_gnomevfssink_open_file (GstGnomeVFSSink *sink) gst_gnomevfssink_signals[SIGNAL_ERASE_ASK], 0, sink->erase); } - gst_element_error (sink, RESOURCE, OPEN_WRITE, + GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (_("Could not open vfs file \"%s\" for writing"), sink->filename), GST_ERROR_SYSTEM); return FALSE; @@ -307,7 +307,7 @@ gst_gnomevfssink_close_file (GstGnomeVFSSink *sink) result = gnome_vfs_close(sink->handle); if (result != GNOME_VFS_OK) - gst_element_error (sink, RESOURCE, CLOSE, + GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, (_("Could not close vfs file \"%s\""), sink->filename), GST_ERROR_SYSTEM); } diff --git a/ext/gnomevfs/gstgnomevfssrc.c b/ext/gnomevfs/gstgnomevfssrc.c index 0bd160f4a2..05b541dc81 100644 --- a/ext/gnomevfs/gstgnomevfssrc.c +++ b/ext/gnomevfs/gstgnomevfssrc.c @@ -525,7 +525,7 @@ static int audiocast_init(GstGnomeVFSSrc *src) return TRUE; GST_DEBUG ("audiocast: registering listener"); if (audiocast_register_listener(&src->audiocast_port, &src->audiocast_fd) < 0) { - gst_element_error (src, RESOURCE, OPEN_READ, NULL, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, NULL, ("Unable to listen on UDP port %d", src->audiocast_port)); close(src->audiocast_fd); return FALSE; @@ -542,7 +542,7 @@ static int audiocast_init(GstGnomeVFSSrc *src) GST_DEBUG ("audiocast: creating audiocast thread"); src->audiocast_thread = g_thread_create((GThreadFunc) audiocast_thread_run, src, TRUE, &error); if (error != NULL) { - gst_element_error (src, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, ("Unable to create thread: %s", error->message)); close(src->audiocast_fd); return FALSE; @@ -1043,7 +1043,7 @@ static gboolean gst_gnomevfssrc_open_file(GstGnomeVFSSrc *src) /* create the uri */ src->uri = gnome_vfs_uri_new(src->filename); if (!src->uri) { - gst_element_error (src, RESOURCE, OPEN_READ, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("Could not open vfs file \"%s\" for reading"), src->filename), GST_ERROR_SYSTEM); return FALSE; } @@ -1066,7 +1066,7 @@ static gboolean gst_gnomevfssrc_open_file(GstGnomeVFSSrc *src) audiocast_thread_kill(src); escaped = gnome_vfs_unescape_string_for_display (src->filename); - gst_element_error (src, RESOURCE, OPEN_READ, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("Could not open vfs file \"%s\" for reading"), escaped), (gnome_vfs_result_to_string (result))); g_free (escaped); diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index b9f38cab15..cf023ae686 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -356,7 +356,7 @@ gst_ogg_start_playing (GstOggDemux *ogg) GST_DEBUG_OBJECT (ogg, "got EOS in setup, changing to playback now"); if (!gst_pad_send_event (GST_PAD_PEER (ogg->sinkpad), gst_event_new_seek (GST_FORMAT_BYTES | GST_SEEK_METHOD_SET, 0))) { - gst_element_error (ogg, CORE, SEEK, (NULL), + GST_ELEMENT_ERROR (ogg, CORE, SEEK, (NULL), ("cannot seek to start after EOS")); } ogg->current_chain = 0; @@ -458,7 +458,7 @@ gst_ogg_demux_chain (GstPad *pad, GstData *buffer) memcpy (data, GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer)); if (ogg_sync_wrote (&ogg->sync, GST_BUFFER_SIZE (buffer)) != 0) { gst_data_unref (buffer); - gst_element_error (ogg, LIBRARY, FAILED /* MEMORY */, NULL, ("ogg_sync_wrote failed")); + GST_ELEMENT_ERROR (ogg, LIBRARY, TOO_LAZY, NULL, ("ogg_sync_wrote failed")); return; } offset_end = GST_BUFFER_OFFSET_IS_VALID (buffer) ? @@ -524,7 +524,7 @@ gst_ogg_demux_chain (GstPad *pad, GstData *buffer) GST_DEBUG_OBJECT (ogg, "stream can seek, try setup now"); if (!gst_pad_send_event (GST_PAD_PEER (ogg->sinkpad), gst_event_new_seek (GST_FORMAT_BYTES | GST_SEEK_METHOD_SET, 0))) { - gst_element_error (ogg, CORE, SEEK, NULL, + GST_ELEMENT_ERROR (ogg, CORE, SEEK, NULL, ("stream can seek to end, but not to start. Can't handle that.")); } gst_ogg_add_chain (ogg); @@ -609,7 +609,7 @@ br: /* FIXME: monitor if we are still in creation stage? */ cur = gst_ogg_pad_new (ogg, ogg_page_serialno (page)); if (!cur) { - gst_element_error (ogg, LIBRARY, FAILED, NULL, ("Creating ogg_stream struct failed.")); + GST_ELEMENT_ERROR (ogg, LIBRARY, TOO_LAZY, NULL, ("Creating ogg_stream struct failed.")); return; } if (ogg->current_chain == -1) { @@ -620,7 +620,7 @@ br: } } if (cur == NULL) { - gst_element_error (ogg, STREAM, DECODE, NULL, ("invalid ogg stream serial no")); + GST_ELEMENT_ERROR (ogg, STREAM, DECODE, NULL, ("invalid ogg stream serial no")); return; } if (ogg_stream_pagein (&cur->stream, page) != 0) { diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c index cb917fe57c..0b750241a1 100644 --- a/ext/vorbis/vorbisdec.c +++ b/ext/vorbis/vorbisdec.c @@ -246,13 +246,13 @@ vorbis_dec_chain (GstPad *pad, GstData *data) /* header packet */ if (packet.packet[0] / 2 != packet.packetno) { /* FIXME: just skip? */ - gst_element_error (GST_ELEMENT (vd), STREAM, DECODE, + GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE, (NULL), ("unexpected packet type %d", (gint) packet.packet[0])); gst_data_unref (data); return; } if (vorbis_synthesis_headerin (&vd->vi, &vd->vc, &packet)) { - gst_element_error (GST_ELEMENT (vd), STREAM, DECODE, + GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE, (NULL), ("couldn't read header packet")); gst_data_unref (data); return; @@ -284,13 +284,13 @@ vorbis_dec_chain (GstPad *pad, GstData *data) /* normal data packet */ if (vorbis_synthesis (&vd->vb, &packet)) { - gst_element_error (GST_ELEMENT (vd), STREAM, DECODE, + GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE, (NULL), ("couldn't read data packet")); gst_data_unref (data); return; } if (vorbis_synthesis_blockin (&vd->vd, &vd->vb) < 0) { - gst_element_error (GST_ELEMENT (vd), STREAM, DECODE, + GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE, (NULL), ("vorbis decoder did not accept data packet")); gst_data_unref (data); return; diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c index 97c417358c..dcd4a6f974 100644 --- a/ext/vorbis/vorbisenc.c +++ b/ext/vorbis/vorbisenc.c @@ -783,7 +783,7 @@ gst_vorbisenc_chain (GstPad * pad, GstData *_data) if (!vorbisenc->setup) { gst_buffer_unref (buf); - gst_element_error (vorbisenc, CORE, NEGOTIATION, NULL, ("encoder not initialized (input is not audio?)")); + GST_ELEMENT_ERROR (vorbisenc, CORE, NEGOTIATION, NULL, ("encoder not initialized (input is not audio?)")); return; } diff --git a/ext/vorbis/vorbisfile.c b/ext/vorbis/vorbisfile.c index fda6f42f07..3e6a21d4bf 100644 --- a/ext/vorbis/vorbisfile.c +++ b/ext/vorbis/vorbisfile.c @@ -500,7 +500,7 @@ gst_vorbisfile_loop (GstElement *element) /* open our custom vorbisfile data object with the callbacks we provide */ if (ov_open_callbacks (vorbisfile, &vorbisfile->vf, NULL, 0, vorbisfile_ov_callbacks) < 0) { - gst_element_error (element, STREAM, WRONG_TYPE, NULL, NULL); + GST_ELEMENT_ERROR (element, STREAM, WRONG_TYPE, NULL, NULL); return; } vorbisfile->need_discont = TRUE; diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c index 870f778222..4948db38d5 100644 --- a/gst-libs/gst/riff/riff-read.c +++ b/gst-libs/gst/riff/riff-read.c @@ -168,7 +168,7 @@ gst_riff_peek_head (GstRiffRead *riff, gst_pad_event_default (riff->sinkpad, event); } else { gst_event_unref (event); - gst_element_error (riff, RESOURCE, READ, NULL, NULL); + GST_ELEMENT_ERROR (riff, RESOURCE, READ, NULL, NULL); } return FALSE; } @@ -197,7 +197,7 @@ gst_riff_read_element_data (GstRiffRead *riff, GstBuffer *buf = NULL; if (gst_bytestream_peek (riff->bs, &buf, length) != length) { - gst_element_error (riff, RESOURCE, READ, NULL, NULL); + GST_ELEMENT_ERROR (riff, RESOURCE, READ, NULL, NULL); if (buf) gst_buffer_unref (buf); return NULL; @@ -240,7 +240,7 @@ gst_riff_read_seek (GstRiffRead *riff, /* now seek */ if (!gst_bytestream_seek (riff->bs, offset, GST_SEEK_METHOD_SET)) { - gst_element_error (riff, RESOURCE, SEEK, NULL, NULL); + GST_ELEMENT_ERROR (riff, RESOURCE, SEEK, NULL, NULL); return NULL; } @@ -252,7 +252,7 @@ gst_riff_read_seek (GstRiffRead *riff, /* get the discont event and return */ gst_bytestream_get_status (riff->bs, &remaining, &event); if (!event || GST_EVENT_TYPE (event) != GST_EVENT_DISCONTINUOUS) { - gst_element_error (riff, CORE, EVENT, NULL, + GST_ELEMENT_ERROR (riff, CORE, EVENT, NULL, ("No discontinuity event after seek")); if (event) gst_event_unref (event); @@ -296,7 +296,7 @@ gst_riff_peek_list (GstRiffRead *riff) } if (gst_bytestream_peek_bytes (riff->bs, &data, 12) != 12) { - gst_element_error (riff, RESOURCE, READ, NULL, NULL); + GST_ELEMENT_ERROR (riff, RESOURCE, READ, NULL, NULL); return 0; } @@ -656,7 +656,7 @@ gst_riff_read_list (GstRiffRead *riff, } gst_bytestream_flush_fast (riff->bs, 8); if (gst_bytestream_peek_bytes (riff->bs, &data, 4) != 4) { - gst_element_error (riff, RESOURCE, READ, NULL, NULL); + GST_ELEMENT_ERROR (riff, RESOURCE, READ, NULL, NULL); return FALSE; } gst_bytestream_flush_fast (riff->bs, 4); @@ -844,14 +844,14 @@ gst_riff_read_header (GstRiffRead *riff, if (!gst_riff_peek_head (riff, &tag, &length, NULL)) return FALSE; if (tag != GST_RIFF_TAG_RIFF) { - gst_element_error (riff, STREAM, WRONG_TYPE, NULL, NULL); + GST_ELEMENT_ERROR (riff, STREAM, WRONG_TYPE, NULL, NULL); return FALSE; } gst_bytestream_flush_fast (riff->bs, 8); /* doctype */ if (gst_bytestream_peek_bytes (riff->bs, &data, 4) != 4) { - gst_element_error (riff, RESOURCE, READ, NULL, NULL); + GST_ELEMENT_ERROR (riff, RESOURCE, READ, NULL, NULL); return FALSE; } gst_bytestream_flush_fast (riff->bs, 4); diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c index eb16a5dd40..a21d184fc6 100644 --- a/gst/adder/gstadder.c +++ b/gst/adder/gstadder.c @@ -312,7 +312,7 @@ gst_adder_loop (GstElement *element) buf_out = gst_buffer_new_and_alloc (1024); if (buf_out == NULL) { - gst_element_error (adder, CORE, TOO_LAZY, NULL, ("could not get new output buffer")); + GST_ELEMENT_ERROR (adder, CORE, TOO_LAZY, NULL, ("could not get new output buffer")); return; } @@ -400,7 +400,7 @@ gst_adder_loop (GstElement *element) for (i = 0; i < GST_BUFFER_SIZE (buf_out); i++) out[i] = CLAMP(out[i] + in[i], 0x80, 0x7f); } else { - gst_element_error (adder, STREAM, FORMAT, NULL, + GST_ELEMENT_ERROR (adder, STREAM, FORMAT, NULL, ("invalid width (%u) for integer audio in gstadder", adder->width)); return; @@ -417,13 +417,13 @@ gst_adder_loop (GstElement *element) for (i = 0; i < GST_BUFFER_SIZE (buf_out) / sizeof (gfloat); i++) out[i] = CLAMP(out[i] + in[i], -1.0, 1.0); } else { - gst_element_error (adder, STREAM, FORMAT, NULL, + GST_ELEMENT_ERROR (adder, STREAM, FORMAT, NULL, ("invalid width (%u) for float audio in gstadder", adder->width)); return; } } else { - gst_element_error (adder, STREAM, FORMAT, NULL, + GST_ELEMENT_ERROR (adder, STREAM, FORMAT, NULL, ("invalid audio format (%d) in gstadder", adder->format)); return; diff --git a/gst/sine/gstsinesrc.c b/gst/sine/gstsinesrc.c index 447a491d30..a5cd0ef813 100644 --- a/gst/sine/gstsinesrc.c +++ b/gst/sine/gstsinesrc.c @@ -383,7 +383,7 @@ gst_sinesrc_get (GstPad *pad) if (!GST_PAD_CAPS (src->srcpad)) { if (gst_sinesrc_link (src->srcpad, gst_pad_get_allowed_caps (src->srcpad)) <= 0) { - gst_element_error (src, CORE, NEGOTIATION, NULL, NULL); + GST_ELEMENT_ERROR (src, CORE, NEGOTIATION, NULL, NULL); return NULL; } } diff --git a/gst/tags/gstvorbistag.c b/gst/tags/gstvorbistag.c index a3da0e1e6e..72089fc44b 100644 --- a/gst/tags/gstvorbistag.c +++ b/gst/tags/gstvorbistag.c @@ -526,7 +526,7 @@ gst_vorbis_tag_chain (GstPad *pad, GstData *data) } if (GST_BUFFER_SIZE (buffer) == 0) - gst_element_error (tag, CORE, TAG, NULL, ("empty buffers are not allowed in vorbis data")); + GST_ELEMENT_ERROR (tag, CORE, TAG, NULL, ("empty buffers are not allowed in vorbis data")); if (GST_BUFFER_DATA (buffer)[0] == 3) { gchar *vendor; @@ -534,7 +534,7 @@ gst_vorbis_tag_chain (GstPad *pad, GstData *data) gst_data_unref (data); if (list == NULL) { - gst_element_error (tag, CORE, TAG, NULL, ("invalid data in vorbis comments")); + GST_ELEMENT_ERROR (tag, CORE, TAG, NULL, ("invalid data in vorbis comments")); return; } gst_element_found_tags_for_pad (GST_ELEMENT (tag), tag->srcpad, 0, diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c index 12557e5d93..07cb871dab 100644 --- a/gst/videotestsrc/gstvideotestsrc.c +++ b/gst/videotestsrc/gstvideotestsrc.c @@ -406,7 +406,7 @@ gst_videotestsrc_get (GstPad * pad) videotestsrc = GST_VIDEOTESTSRC (gst_pad_get_parent (pad)); if (videotestsrc->fourcc == NULL) { - gst_element_error (videotestsrc, CORE, NEGOTIATION, NULL, + GST_ELEMENT_ERROR (videotestsrc, CORE, NEGOTIATION, NULL, ("format wasn't negotiated before get function")); return NULL; } diff --git a/sys/v4l/gstv4lmjpegsink.c b/sys/v4l/gstv4lmjpegsink.c index fa0b80112c..3632b27659 100644 --- a/sys/v4l/gstv4lmjpegsink.c +++ b/sys/v4l/gstv4lmjpegsink.c @@ -269,7 +269,7 @@ gst_v4lmjpegsink_chain (GstPad *pad, /* check size */ if (GST_BUFFER_SIZE(buf) > v4lmjpegsink->breq.size) { - gst_element_error (v4lmjpegsink, RESOURCE, WRITE, NULL, + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, WRITE, NULL, ("Buffer too big (%d KB), max. buffersize is %ld KB", GST_BUFFER_SIZE(buf)/1024, v4lmjpegsink->breq.size/1024)); return; diff --git a/sys/v4l/gstv4lmjpegsrc.c b/sys/v4l/gstv4lmjpegsrc.c index 4fd3f0dfdd..1287561cd0 100644 --- a/sys/v4l/gstv4lmjpegsrc.c +++ b/sys/v4l/gstv4lmjpegsrc.c @@ -811,6 +811,6 @@ gst_v4lmjpegsrc_buffer_free (GstBuffer *buf) } if (n == v4lmjpegsrc->breq.count) - gst_element_error(v4lmjpegsrc, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, TOO_LAZY, NULL, ("Couldn't find the buffer")); } diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c index 3553cb8eaf..ade892d605 100644 --- a/sys/v4l/gstv4lsrc.c +++ b/sys/v4l/gstv4lsrc.c @@ -874,7 +874,7 @@ gst_v4lsrc_buffer_free (GstBuffer *buf) } if (n == v4lsrc->mbuf.frames) - gst_element_error (v4lsrc, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, TOO_LAZY, NULL, ("Couldn\'t find the buffer")); } diff --git a/sys/v4l/v4l-overlay_calls.c b/sys/v4l/v4l-overlay_calls.c index cee12fe1a1..006ee14d05 100644 --- a/sys/v4l/v4l-overlay_calls.c +++ b/sys/v4l/v4l-overlay_calls.c @@ -65,14 +65,14 @@ gst_v4l_set_overlay (GstV4lElement *v4lelement) switch (system(buff)) { case -1: - gst_element_error (v4lelement, RESOURCE, FAILED, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, FAILED, (_("Could not start v4l-conf")), GST_ERROR_SYSTEM); g_free(buff); return FALSE; case 0: break; default: - gst_element_error (v4lelement, RESOURCE, FAILED, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, FAILED, (_("Executing v4l-conf failed")), GST_ERROR_SYSTEM); g_free(buff); return FALSE; @@ -126,7 +126,7 @@ gst_v4l_set_window (GstElement *element, if (ioctl(v4lelement->video_fd, VIDIOCSWIN, &vwin) < 0) { - gst_element_error (v4lelement, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, TOO_LAZY, NULL, ("Failed to set the video window: %s", g_strerror (errno))); return FALSE; } @@ -153,7 +153,7 @@ gst_v4l_enable_overlay (GstV4lElement *v4lelement, if (ioctl(v4lelement->video_fd, VIDIOCCAPTURE, &doit) < 0) { - gst_element_error (v4lelement, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, TOO_LAZY, NULL, ("Failed to %s overlay display: %s", enable?"enable":"disable", g_strerror (errno))); return FALSE; diff --git a/sys/v4l/v4l_calls.c b/sys/v4l/v4l_calls.c index fce4ed3e64..85e8f1e67a 100644 --- a/sys/v4l/v4l_calls.c +++ b/sys/v4l/v4l_calls.c @@ -84,7 +84,7 @@ gst_v4l_get_capabilities (GstV4lElement *v4lelement) if (ioctl(v4lelement->video_fd, VIDIOCGCAP, &(v4lelement->vcap)) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("error getting capabilities %s of from device %s", g_strerror (errno), v4lelement->videodev)); return FALSE; @@ -111,7 +111,7 @@ gst_v4l_open (GstV4lElement *v4lelement) /* be sure we have a device */ if (!v4lelement->videodev) { - gst_element_error (v4lelement, RESOURCE, NOT_FOUND, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, NOT_FOUND, (_("No device specified")), NULL); return FALSE; } @@ -120,7 +120,7 @@ gst_v4l_open (GstV4lElement *v4lelement) v4lelement->video_fd = open(v4lelement->videodev, O_RDWR); if (!GST_V4L_IS_OPEN(v4lelement)) { - gst_element_error (v4lelement, RESOURCE, OPEN_READ_WRITE, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, OPEN_READ_WRITE, (_("Could not open device \"%s\" for reading and writing"), v4lelement->videodev), GST_ERROR_SYSTEM); return FALSE; @@ -141,7 +141,7 @@ gst_v4l_open (GstV4lElement *v4lelement) !(v4lelement->vcap.type & VID_TYPE_MJPEG_ENCODER)) || (GST_IS_V4LMJPEGSINK(v4lelement) && !(v4lelement->vcap.type & VID_TYPE_MJPEG_DECODER))) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Device opened, but wrong type (0x%x)", v4lelement->vcap.type)); close(v4lelement->video_fd); @@ -354,7 +354,7 @@ gst_v4l_set_chan_norm (GstV4lElement *v4lelement, if (ioctl(v4lelement->video_fd, VIDIOCSCHAN, &(v4lelement->vchan)) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error setting the channel/norm settings: %s", g_strerror(errno))); return FALSE; @@ -362,7 +362,7 @@ gst_v4l_set_chan_norm (GstV4lElement *v4lelement, if (ioctl(v4lelement->video_fd, VIDIOCGCHAN, &(v4lelement->vchan)) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error getting the channel/norm settings: %s", g_strerror(errno))); return FALSE; @@ -391,7 +391,7 @@ gst_v4l_get_signal (GstV4lElement *v4lelement, tuner.tuner = tunernum; if (ioctl(v4lelement->video_fd, VIDIOCGTUNER, &tuner) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error getting tuner signal: %s", g_strerror (errno))); return FALSE; } @@ -427,7 +427,7 @@ gst_v4l_get_frequency (GstV4lElement *v4lelement, if (ioctl(v4lelement->video_fd, VIDIOCGFREQ, frequency) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error getting tuner frequency: %s", g_strerror (errno))); return FALSE; } @@ -461,7 +461,7 @@ gst_v4l_set_frequency (GstV4lElement *v4lelement, if (ioctl(v4lelement->video_fd, VIDIOCSFREQ, &frequency) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error setting tuner frequency: %s", g_strerror (errno))); return FALSE; } @@ -489,7 +489,7 @@ gst_v4l_get_picture (GstV4lElement *v4lelement, if (ioctl(v4lelement->video_fd, VIDIOCGPICT, &vpic) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error getting picture parameters: %s", g_strerror (errno))); return FALSE; } @@ -509,7 +509,7 @@ gst_v4l_get_picture (GstV4lElement *v4lelement, *value = vpic.colour; break; default: - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error getting picture parameters: unknown type %d", type)); return FALSE; } @@ -537,7 +537,7 @@ gst_v4l_set_picture (GstV4lElement *v4lelement, if (ioctl(v4lelement->video_fd, VIDIOCGPICT, &vpic) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error getting picture parameters: %s", g_strerror (errno))); return FALSE; } @@ -557,14 +557,14 @@ gst_v4l_set_picture (GstV4lElement *v4lelement, vpic.colour = value; break; default: - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error setting picture parameters: unknown type %d", type)); return FALSE; } if (ioctl(v4lelement->video_fd, VIDIOCSPICT, &vpic) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error setting picture parameters: %s", g_strerror (errno))); return FALSE; } @@ -594,7 +594,7 @@ gst_v4l_get_audio (GstV4lElement *v4lelement, vau.audio = audionum; if (ioctl(v4lelement->video_fd, VIDIOCGAUDIO, &vau) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error getting audio parameters: %s", g_strerror (errno))); return FALSE; } @@ -611,7 +611,7 @@ gst_v4l_get_audio (GstV4lElement *v4lelement, *value = vau.mode; break; default: - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error getting audio parameters: unknown type %d", type)); return FALSE; } @@ -641,7 +641,7 @@ gst_v4l_set_audio (GstV4lElement *v4lelement, vau.audio = audionum; if (ioctl(v4lelement->video_fd, VIDIOCGAUDIO, &vau) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error getting audio parameters: %s", g_strerror (errno))); return FALSE; } @@ -651,7 +651,7 @@ gst_v4l_set_audio (GstV4lElement *v4lelement, case V4L_AUDIO_MUTE: if (!(vau.flags & VIDEO_AUDIO_MUTABLE)) { - gst_element_error (v4lelement, CORE, NOT_IMPLEMENTED, NULL, + GST_ELEMENT_ERROR (v4lelement, CORE, NOT_IMPLEMENTED, NULL, ("Error setting audio mute: (un)setting mute is not supported")); return FALSE; } @@ -663,7 +663,7 @@ gst_v4l_set_audio (GstV4lElement *v4lelement, case V4L_AUDIO_VOLUME: if (!(vau.flags & VIDEO_AUDIO_VOLUME)) { - gst_element_error (v4lelement, CORE, NOT_IMPLEMENTED, NULL, + GST_ELEMENT_ERROR (v4lelement, CORE, NOT_IMPLEMENTED, NULL, ("Error setting audio volume: setting volume is not supported")); return FALSE; } @@ -673,14 +673,14 @@ gst_v4l_set_audio (GstV4lElement *v4lelement, vau.mode = value; break; default: - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error setting audio parameters: unknown type %d", type)); return FALSE; } if (ioctl(v4lelement->video_fd, VIDIOCSAUDIO, &vau) < 0) { - gst_element_error (v4lelement, RESOURCE, SETTINGS, NULL, + GST_ELEMENT_ERROR (v4lelement, RESOURCE, SETTINGS, NULL, ("Error setting audio parameters: %s", g_strerror (errno))); return FALSE; } diff --git a/sys/v4l/v4l_calls.h b/sys/v4l/v4l_calls.h index c169f7dc33..a080ea7c70 100644 --- a/sys/v4l/v4l_calls.h +++ b/sys/v4l/v4l_calls.h @@ -43,7 +43,7 @@ extern "C" { #define GST_V4L_CHECK_OPEN(element) \ if (element->video_fd <= 0) \ { \ - gst_element_error (element, RESOURCE, TOO_LAZY, \ + GST_ELEMENT_ERROR (element, RESOURCE, TOO_LAZY, \ (_("Device is not open")), NULL); \ return FALSE; \ } @@ -52,7 +52,7 @@ extern "C" { #define GST_V4L_CHECK_NOT_OPEN(element) \ if (element->video_fd != -1) \ { \ - gst_element_error (element, RESOURCE, TOO_LAZY, \ + GST_ELEMENT_ERROR (element, RESOURCE, TOO_LAZY, \ (_("Device is open")), NULL); \ return FALSE; \ } @@ -61,7 +61,7 @@ extern "C" { #define GST_V4L_CHECK_OVERLAY(element) \ if (!(element->vcap.type & VID_TYPE_OVERLAY)) \ { \ - gst_element_error (element, RESOURCE, TOO_LAZY, \ + GST_ELEMENT_ERROR (element, RESOURCE, TOO_LAZY, \ NULL, ("Device cannot handle overlay")); \ return FALSE; \ } @@ -70,7 +70,7 @@ extern "C" { #define GST_V4L_CHECK_ACTIVE(element) \ if (element->buffer == NULL) \ { \ - gst_element_error (element, RESOURCE, SETTINGS, \ + GST_ELEMENT_ERROR (element, RESOURCE, SETTINGS, \ NULL, ("Device is not in streaming mode")); \ return FALSE; \ } @@ -79,7 +79,7 @@ extern "C" { #define GST_V4L_CHECK_NOT_ACTIVE(element) \ if (element->buffer != NULL) \ { \ - gst_element_error (element, RESOURCE, SETTINGS, \ + GST_ELEMENT_ERROR (element, RESOURCE, SETTINGS, \ NULL, ("Device is in streaming mode")); \ return FALSE; \ } diff --git a/sys/v4l/v4lmjpegsink_calls.c b/sys/v4l/v4lmjpegsink_calls.c index de10d79f77..3911aa8493 100644 --- a/sys/v4l/v4lmjpegsink_calls.c +++ b/sys/v4l/v4lmjpegsink_calls.c @@ -80,7 +80,7 @@ gst_v4lmjpegsink_sync_thread (void *arg) if (ioctl(GST_V4LELEMENT(v4lmjpegsink)->video_fd, MJPIOC_SYNC, &(v4lmjpegsink->bsync)) < 0) { - gst_element_error (v4lmjpegsink, RESOURCE, SYNC, NULL, + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, SYNC, NULL, ("Failed to sync on frame %d: %s", frame, g_strerror (errno))); g_mutex_lock(v4lmjpegsink->mutex_queued_frames); @@ -94,7 +94,7 @@ gst_v4lmjpegsink_sync_thread (void *arg) /* be sure that we're not confusing */ if (frame != v4lmjpegsink->bsync.frame) { - gst_element_error (v4lmjpegsink, CORE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsink, CORE, TOO_LAZY, NULL, ("Internal error: frame number confusion")); goto end; } @@ -129,7 +129,7 @@ gst_v4lmjpegsink_queue_frame (GstV4lMjpegSink *v4lmjpegsink, /* queue on this frame */ if (ioctl(GST_V4LELEMENT(v4lmjpegsink)->video_fd, MJPIOC_QBUF_PLAY, &num) < 0) { - gst_element_error (v4lmjpegsink, RESOURCE, WRITE, NULL, + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, WRITE, NULL, ("Failed to queue frame %d: %s", num, g_strerror(errno))); return FALSE; @@ -226,7 +226,7 @@ gst_v4lmjpegsink_set_playback (GstV4lMjpegSink *v4lmjpegsink, if (ioctl(GST_V4LELEMENT(v4lmjpegsink)->video_fd, MJPIOC_G_PARAMS, &bparm) < 0) { - gst_element_error (v4lmjpegsink, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); return FALSE; } @@ -242,7 +242,7 @@ gst_v4lmjpegsink_set_playback (GstV4lMjpegSink *v4lmjpegsink, if (width > mw || height > mh) { - gst_element_error (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, ("Video dimensions (%dx%d) are larger than device max (%dx%d)", width, height, mw, mh)); return FALSE; @@ -272,7 +272,7 @@ gst_v4lmjpegsink_set_playback (GstV4lMjpegSink *v4lmjpegsink, { if (height > mh/2) { - gst_element_error (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, ("Video dimensions (%dx%d) too large for non-interlaced playback (%dx%d)", width, height, mw, mh/2)); return FALSE; @@ -319,7 +319,7 @@ gst_v4lmjpegsink_set_playback (GstV4lMjpegSink *v4lmjpegsink, if (ioctl(GST_V4LELEMENT(v4lmjpegsink)->video_fd, MJPIOC_S_PARAMS, &bparm) < 0) { - gst_element_error (v4lmjpegsink, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); return FALSE; } @@ -345,7 +345,7 @@ gst_v4lmjpegsink_playback_init (GstV4lMjpegSink *v4lmjpegsink) /* Request buffers */ if (ioctl(GST_V4LELEMENT(v4lmjpegsink)->video_fd, MJPIOC_REQBUFS, &(v4lmjpegsink->breq)) < 0) { - gst_element_error (v4lmjpegsink, RESOURCE, READ, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, READ, NULL, GST_ERROR_SYSTEM); return FALSE; } @@ -358,7 +358,7 @@ gst_v4lmjpegsink_playback_init (GstV4lMjpegSink *v4lmjpegsink) PROT_READ|PROT_WRITE, MAP_SHARED, GST_V4LELEMENT(v4lmjpegsink)->video_fd, 0); if (GST_V4LELEMENT(v4lmjpegsink)->buffer == MAP_FAILED) { - gst_element_error (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, ("Error mapping video buffers: %s", g_strerror(errno))); GST_V4LELEMENT(v4lmjpegsink)->buffer = NULL; @@ -371,7 +371,7 @@ gst_v4lmjpegsink_playback_init (GstV4lMjpegSink *v4lmjpegsink) malloc(sizeof(gint8) * v4lmjpegsink->breq.count); if (!v4lmjpegsink->isqueued_queued_frames) { - gst_element_error (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, ("Failed to create queue tracker: %s", g_strerror(errno))); return FALSE; @@ -380,7 +380,7 @@ gst_v4lmjpegsink_playback_init (GstV4lMjpegSink *v4lmjpegsink) malloc(sizeof(GCond *) * v4lmjpegsink->breq.count); if (!v4lmjpegsink->cond_queued_frames) { - gst_element_error (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, ("Failed to create queue condition holders: %s", g_strerror(errno))); return FALSE; @@ -419,7 +419,7 @@ gst_v4lmjpegsink_playback_start (GstV4lMjpegSink *v4lmjpegsink) gst_v4lmjpegsink_sync_thread, (void *) v4lmjpegsink, TRUE, &error); if(!v4lmjpegsink->thread_queued_frames) { - gst_element_error (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsink, RESOURCE, TOO_LAZY, NULL, ("Failed to create sync thread: %s", error->message)); return FALSE; } diff --git a/sys/v4l/v4lmjpegsrc_calls.c b/sys/v4l/v4lmjpegsrc_calls.c index f500f59e30..8af98fc2de 100644 --- a/sys/v4l/v4lmjpegsrc_calls.c +++ b/sys/v4l/v4lmjpegsrc_calls.c @@ -67,7 +67,7 @@ gst_v4lmjpegsrc_queue_frame (GstV4lMjpegSrc *v4lmjpegsrc, if (ioctl(GST_V4LELEMENT(v4lmjpegsrc)->video_fd, MJPIOC_QBUF_CAPT, &num) < 0) { - gst_element_error (v4lmjpegsrc, RESOURCE, READ, NULL, + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, READ, NULL, ("Error queueing a buffer (%d): %s", num, g_strerror(errno))); return FALSE; @@ -99,7 +99,7 @@ gst_v4lmjpegsrc_sync_next_frame (GstV4lMjpegSrc *v4lmjpegsrc, while (ioctl(GST_V4LELEMENT(v4lmjpegsrc)->video_fd, MJPIOC_SYNC, &(v4lmjpegsrc->bsync)) < 0) { if (errno != EINTR) { - gst_element_error (v4lmjpegsrc, RESOURCE, SYNC, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, SYNC, NULL, GST_ERROR_SYSTEM); return FALSE; } DEBUG("Sync got interrupted"); @@ -161,7 +161,7 @@ gst_v4lmjpegsrc_set_capture (GstV4lMjpegSrc *v4lmjpegsrc, /* Query params for capture */ if (ioctl(GST_V4LELEMENT(v4lmjpegsrc)->video_fd, MJPIOC_G_PARAMS, &bparm) < 0) { - gst_element_error (v4lmjpegsrc, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); return FALSE; } @@ -187,7 +187,7 @@ gst_v4lmjpegsrc_set_capture (GstV4lMjpegSrc *v4lmjpegsrc, /* Set params for capture */ if (ioctl(GST_V4LELEMENT(v4lmjpegsrc)->video_fd, MJPIOC_S_PARAMS, &bparm) < 0) { - gst_element_error (v4lmjpegsrc, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); return FALSE; } @@ -231,7 +231,7 @@ gboolean gst_v4lmjpegsrc_set_capture_m (GstV4lMjpegSrc *v4lmjpegsrc, /* Query params for capture */ if (ioctl(GST_V4LELEMENT(v4lmjpegsrc)->video_fd, MJPIOC_G_PARAMS, &bparm) < 0) { - gst_element_error (v4lmjpegsrc, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); return FALSE; } @@ -266,21 +266,21 @@ gboolean gst_v4lmjpegsrc_set_capture_m (GstV4lMjpegSrc *v4lmjpegsrc, if (width + x_offset > maxwidth) { - gst_element_error (v4lmjpegsrc, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, TOO_LAZY, NULL, ("Image width+offset (%d) bigger than maximum (%d)", width + x_offset, maxwidth)); return FALSE; } if ((width%(bparm.HorDcm*16))!=0) { - gst_element_error (v4lmjpegsrc, STREAM, FORMAT, NULL, + GST_ELEMENT_ERROR (v4lmjpegsrc, STREAM, FORMAT, NULL, ("Image width (%d) not multiple of %d (required for JPEG)", width, bparm.HorDcm*16)); return FALSE; } if (height + y_offset > (norm==VIDEO_MODE_NTSC ? 480 : 576)) { - gst_element_error (v4lmjpegsrc, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, TOO_LAZY, NULL, ("Image height+offset (%d) bigger than maximum (%d)", height + y_offset, (norm==VIDEO_MODE_NTSC ? 480 : 576))); return FALSE; @@ -290,7 +290,7 @@ gboolean gst_v4lmjpegsrc_set_capture_m (GstV4lMjpegSrc *v4lmjpegsrc, */ if ((height%(bparm.VerDcm*16))!=0) { - gst_element_error (v4lmjpegsrc, STREAM, FORMAT, NULL, + GST_ELEMENT_ERROR (v4lmjpegsrc, STREAM, FORMAT, NULL, ("Image height (%d) not multiple of %d (required for JPEG)", height, bparm.VerDcm*16)); return FALSE; @@ -313,7 +313,7 @@ gboolean gst_v4lmjpegsrc_set_capture_m (GstV4lMjpegSrc *v4lmjpegsrc, /* Set params for capture */ if (ioctl(GST_V4LELEMENT(v4lmjpegsrc)->video_fd, MJPIOC_S_PARAMS, &bparm) < 0) { - gst_element_error (v4lmjpegsrc, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, SETTINGS, NULL, GST_ERROR_SYSTEM); return FALSE; } @@ -338,13 +338,13 @@ gst_v4lmjpegsrc_capture_init (GstV4lMjpegSrc *v4lmjpegsrc) if (ioctl(GST_V4LELEMENT(v4lmjpegsrc)->video_fd, MJPIOC_REQBUFS, &(v4lmjpegsrc->breq)) < 0) { - gst_element_error (v4lmjpegsrc, RESOURCE, READ, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, READ, NULL, GST_ERROR_SYSTEM); return FALSE; } if (v4lmjpegsrc->breq.count < MIN_BUFFERS_QUEUED) { - gst_element_error (v4lmjpegsrc, RESOURCE, READ, NULL, + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, READ, NULL, ("Too little buffers. We got %ld, we want at least %d", v4lmjpegsrc->breq.count, MIN_BUFFERS_QUEUED)); return FALSE; @@ -371,7 +371,7 @@ gst_v4lmjpegsrc_capture_init (GstV4lMjpegSrc *v4lmjpegsrc) PROT_READ|PROT_WRITE, MAP_SHARED, GST_V4LELEMENT(v4lmjpegsrc)->video_fd, 0); if (GST_V4LELEMENT(v4lmjpegsrc)->buffer == MAP_FAILED) { - gst_element_error (v4lmjpegsrc, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, TOO_LAZY, NULL, ("Error mapping video buffers: %s", g_strerror (errno))); GST_V4LELEMENT(v4lmjpegsrc)->buffer = NULL; return FALSE; @@ -513,7 +513,7 @@ gst_v4lmjpegsrc_requeue_frame (GstV4lMjpegSrc *v4lmjpegsrc, g_mutex_lock(v4lmjpegsrc->mutex_queue_state); if (v4lmjpegsrc->frame_queue_state[num] != QUEUE_STATE_SYNCED) { - gst_element_error (v4lmjpegsrc, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lmjpegsrc, RESOURCE, TOO_LAZY, NULL, ("Invalid state %d (expected %d), can't requeue", v4lmjpegsrc->frame_queue_state[num], QUEUE_STATE_SYNCED)); diff --git a/sys/v4l/v4lsrc_calls.c b/sys/v4l/v4lsrc_calls.c index f716cb8ddd..a69b9fc2d6 100644 --- a/sys/v4l/v4lsrc_calls.c +++ b/sys/v4l/v4lsrc_calls.c @@ -88,7 +88,7 @@ gst_v4lsrc_queue_frame (GstV4lSrc *v4lsrc, if (ioctl(GST_V4LELEMENT(v4lsrc)->video_fd, VIDIOCMCAPTURE, &(v4lsrc->mmap)) < 0) { - gst_element_error (v4lsrc, RESOURCE, WRITE, NULL, + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, NULL, ("Error queueing a buffer (%d): %s", num, g_strerror (errno))); return FALSE; } @@ -118,7 +118,7 @@ gst_v4lsrc_sync_frame (GstV4lSrc *v4lsrc, gint num) /* if the sync() got interrupted, we can retry */ if (errno != EINTR) { v4lsrc->frame_queue_state[num] = QUEUE_STATE_ERROR; - gst_element_error (v4lsrc, RESOURCE, SYNC, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, SYNC, NULL, GST_ERROR_SYSTEM); return FALSE; } DEBUG("Sync got interrupted"); @@ -180,14 +180,14 @@ gst_v4lsrc_capture_init (GstV4lSrc *v4lsrc) /* request buffer info */ if (ioctl(GST_V4LELEMENT(v4lsrc)->video_fd, VIDIOCGMBUF, &(v4lsrc->mbuf)) < 0) { - gst_element_error (v4lsrc, RESOURCE, READ, NULL, + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, READ, NULL, ("Error getting buffer information: %s", g_strerror (errno))); return FALSE; } if (v4lsrc->mbuf.frames < MIN_BUFFERS_QUEUED) { - gst_element_error (v4lsrc, RESOURCE, READ, NULL, + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, READ, NULL, ("Not enough buffers. We got %d, we want at least %d", v4lsrc->mbuf.frames, MIN_BUFFERS_QUEUED)); return FALSE; @@ -214,7 +214,7 @@ gst_v4lsrc_capture_init (GstV4lSrc *v4lsrc) PROT_READ|PROT_WRITE, MAP_SHARED, GST_V4LELEMENT(v4lsrc)->video_fd, 0); if (GST_V4LELEMENT(v4lsrc)->buffer == MAP_FAILED) { - gst_element_error (v4lsrc, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, TOO_LAZY, NULL, ("Error mapping video buffers: %s", g_strerror (errno))); GST_V4LELEMENT(v4lsrc)->buffer = NULL; return FALSE; @@ -352,7 +352,7 @@ gst_v4lsrc_requeue_frame (GstV4lSrc *v4lsrc, gint num) g_mutex_lock(v4lsrc->mutex_queue_state); if (v4lsrc->frame_queue_state[num] != QUEUE_STATE_SYNCED) { - gst_element_error (v4lsrc, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, TOO_LAZY, NULL, ("Invalid state %d (expected %d), can't requeue", v4lsrc->frame_queue_state[num], QUEUE_STATE_SYNCED)); @@ -467,7 +467,7 @@ gst_v4lsrc_try_palette (GstV4lSrc *v4lsrc, /* let's start by requesting a buffer and mmap()'ing it */ if (ioctl(GST_V4LELEMENT(v4lsrc)->video_fd, VIDIOCGMBUF, &vmbuf) < 0) { - gst_element_error (v4lsrc, RESOURCE, READ, NULL, + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, READ, NULL, ("Error getting buffer information: %s", g_strerror(errno))); return FALSE; } @@ -476,7 +476,7 @@ gst_v4lsrc_try_palette (GstV4lSrc *v4lsrc, MAP_SHARED, GST_V4LELEMENT(v4lsrc)->video_fd, 0); if (buffer == MAP_FAILED) { - gst_element_error (v4lsrc, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, TOO_LAZY, NULL, ("Error mapping our try-out buffer: %s", g_strerror(errno))); return FALSE; } @@ -489,7 +489,7 @@ gst_v4lsrc_try_palette (GstV4lSrc *v4lsrc, if (ioctl(GST_V4LELEMENT(v4lsrc)->video_fd, VIDIOCMCAPTURE, &vmmap) < 0) { if (errno != EINVAL) /* our format failed! */ - gst_element_error (v4lsrc, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, TOO_LAZY, NULL, ("Error queueing our try-out buffer: %s", g_strerror(errno))); munmap(buffer, vmbuf.size); return FALSE; @@ -497,7 +497,7 @@ gst_v4lsrc_try_palette (GstV4lSrc *v4lsrc, if (ioctl(GST_V4LELEMENT(v4lsrc)->video_fd, VIDIOCSYNC, &frame) < 0) { - gst_element_error (v4lsrc, RESOURCE, SYNC, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (v4lsrc, RESOURCE, SYNC, NULL, GST_ERROR_SYSTEM); munmap(buffer, vmbuf.size); return FALSE; } diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index 452380da85..43ec76488c 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -530,7 +530,7 @@ gst_ximagesink_xcontext_get (GstXImageSink *ximagesink) { g_mutex_unlock (ximagesink->x_lock); g_free (xcontext); - gst_element_error (ximagesink, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (ximagesink, RESOURCE, TOO_LAZY, NULL, ("Could not open display")); return NULL; } @@ -867,7 +867,7 @@ gst_ximagesink_chain (GstPad *pad, GstData *data) else /* No image available. Something went wrong during capsnego ! */ { gst_buffer_unref (buf); - gst_element_error (ximagesink, CORE, NEGOTIATION, NULL, ("no format defined before chain function")); + GST_ELEMENT_ERROR (ximagesink, CORE, NEGOTIATION, NULL, ("no format defined before chain function")); return; } } diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 7a054f3401..7f43057c03 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -724,7 +724,7 @@ gst_xvimagesink_xcontext_get (GstXvImageSink *xvimagesink) { g_mutex_unlock (xvimagesink->x_lock); g_free (xcontext); - gst_element_error (xvimagesink, RESOURCE, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (xvimagesink, RESOURCE, TOO_LAZY, NULL, ("Could not open display")); return NULL; } @@ -1185,7 +1185,7 @@ gst_xvimagesink_chain (GstPad *pad, GstData *data) else /* No image available. Something went wrong during capsnego ! */ { gst_buffer_unref (buf); - gst_element_error (xvimagesink, CORE, NEGOTIATION, NULL, ("no format defined before chain function")); + GST_ELEMENT_ERROR (xvimagesink, CORE, NEGOTIATION, NULL, ("no format defined before chain function")); return; } }