From c5b612edef38b32176c789d7949e02df274012a8 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 29 Jan 2004 23:17:58 +0000 Subject: [PATCH] GST_ELEMENT_ERROR Original commit message from CVS: GST_ELEMENT_ERROR --- ChangeLog | 28 ++++++++++++++++++++++++++++ docs/gst/tmpl/gstelement.sgml | 17 +---------------- docs/gst/tmpl/gstreamer-unused.sgml | 14 ++++++++++++++ docs/gst/tmpl/gstxml.sgml | 10 +++------- gst/autoplug/gstspideridentity.c | 2 +- gst/elements/gstfakesink.c | 2 +- gst/elements/gstfilesink.c | 12 ++++++------ gst/elements/gstfilesrc.c | 16 ++++++++-------- gst/elements/gstidentity.c | 2 +- gst/elements/gstmultidisksrc.c | 4 ++-- gst/elements/gstmultifilesrc.c | 4 ++-- gst/elements/gstpipefilter.c | 8 ++++---- gst/elements/gsttypefind.c | 2 +- gst/gstelement.h | 2 +- gst/gstpad.c | 10 +++++----- gst/gstqueue.c | 4 ++-- gst/schedulers/gstbasicscheduler.c | 8 ++++---- plugins/elements/gstfakesink.c | 2 +- plugins/elements/gstfilesink.c | 12 ++++++------ plugins/elements/gstfilesrc.c | 16 ++++++++-------- plugins/elements/gstidentity.c | 2 +- plugins/elements/gstmultidisksrc.c | 4 ++-- plugins/elements/gstmultifilesrc.c | 4 ++-- plugins/elements/gstpipefilter.c | 8 ++++---- plugins/elements/gstqueue.c | 4 ++-- plugins/elements/gsttypefind.c | 2 +- 26 files changed, 111 insertions(+), 88 deletions(-) diff --git a/ChangeLog b/ChangeLog index d117264..8896ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,34 @@ 2004-01-29 Thomas Vander Stichele + * docs/gst/tmpl/gstelement.sgml: + * docs/gst/tmpl/gstreamer-unused.sgml: + * docs/gst/tmpl/gstxml.sgml: + * gst/autoplug/gstspideridentity.c: + (gst_spider_identity_sink_loop_type_finding): + * gst/elements/gstfakesink.c: (gst_fakesink_change_state): + * gst/elements/gstfilesink.c: (gst_filesink_open_file), + (gst_filesink_close_file), (gst_filesink_handle_event), + (gst_filesink_chain): + * gst/elements/gstfilesrc.c: (gst_filesrc_map_region), + (gst_filesrc_get_read), (gst_filesrc_open_file): + * gst/elements/gstidentity.c: (gst_identity_chain): + * gst/elements/gstmultidisksrc.c: (gst_multidisksrc_open_file): + * gst/elements/gstpipefilter.c: (gst_pipefilter_get), + (gst_pipefilter_chain), (gst_pipefilter_open_file): + * gst/elements/gsttypefind.c: (gst_type_find_element_chain): + * gst/gstelement.h: + * gst/gstpad.c: (gst_pad_set_explicit_caps), + (gst_pad_recover_caps_error), (gst_pad_pull): + * gst/gstqueue.c: (gst_queue_chain), (gst_queue_get): + * gst/schedulers/gstbasicscheduler.c: + (gst_basic_scheduler_chainhandler_proxy), + (gst_basic_scheduler_gethandler_proxy), + (gst_basic_scheduler_cothreaded_chain): + gst_element_error -> GST_ELEMENT_ERROR + +2004-01-29 Thomas Vander Stichele + * docs/Makefile.am: * docs/gst/tmpl/gstelement.sgml: * docs/gst/tmpl/gstxml.sgml: diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml index 126421a..bbbffaf 100644 --- a/docs/gst/tmpl/gstelement.sgml +++ b/docs/gst/tmpl/gstelement.sgml @@ -379,22 +379,6 @@ Sets the name of the element, getting rid of the old name if there was one. @element: - - - - - -@el: -@domain: -@code: -@message: -@debug: - -@element: -@error: -@Varargs: - - @@ -996,6 +980,7 @@ Is triggered whenever an error occured. @: @: @: +@: @: diff --git a/docs/gst/tmpl/gstreamer-unused.sgml b/docs/gst/tmpl/gstreamer-unused.sgml index cc6fc05..3138437 100644 --- a/docs/gst/tmpl/gstreamer-unused.sgml +++ b/docs/gst/tmpl/gstreamer-unused.sgml @@ -8357,6 +8357,20 @@ of an element he doesn't need anymore. @a: @b: + + + + + +@el: +@domain: +@code: +@message: +@debug: +@element: +@error: +@Varargs: + diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml index 08450b2..32d00bc 100644 --- a/docs/gst/tmpl/gstxml.sgml +++ b/docs/gst/tmpl/gstxml.sgml @@ -110,10 +110,6 @@ All GstElements can be serialized to an XML presentation and subsequently loaded -@: -@: -@: - @gstxml: the object which received the signal. @arg1: @arg2: @@ -123,7 +119,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded -@gstxml: the object which received the signal. -@arg1: -@arg2: +@: +@: +@: diff --git a/gst/autoplug/gstspideridentity.c b/gst/autoplug/gstspideridentity.c index 981807b..7cdbbfa 100644 --- a/gst/autoplug/gstspideridentity.c +++ b/gst/autoplug/gstspideridentity.c @@ -498,7 +498,7 @@ gst_spider_identity_sink_loop_type_finding (GstSpiderIdentity *ident) } if (find.best_probability > 0) goto plug; - gst_element_error (ident, STREAM, TYPE_NOT_FOUND, NULL, NULL); + GST_ELEMENT_ERROR (ident, STREAM, TYPE_NOT_FOUND, NULL, NULL); find.buffer = GST_BUFFER (gst_event_new (GST_EVENT_EOS)); end: diff --git a/gst/elements/gstfakesink.c b/gst/elements/gstfakesink.c index ece69de..34eace7 100644 --- a/gst/elements/gstfakesink.c +++ b/gst/elements/gstfakesink.c @@ -391,7 +391,7 @@ gst_fakesink_change_state (GstElement *element) return GST_STATE_SUCCESS; error: - gst_element_error (element, CORE, STATE_CHANGE, + GST_ELEMENT_ERROR (element, CORE, STATE_CHANGE, NULL, NULL); return GST_STATE_FAILURE; } diff --git a/gst/elements/gstfilesink.c b/gst/elements/gstfilesink.c index aeb2d33..32e5481 100644 --- a/gst/elements/gstfilesink.c +++ b/gst/elements/gstfilesink.c @@ -233,14 +233,14 @@ gst_filesink_open_file (GstFileSink *sink) /* open the file */ if (!sink->filename) { - gst_element_error (sink, RESOURCE, NOT_FOUND, + GST_ELEMENT_ERROR (sink, RESOURCE, NOT_FOUND, (_("No filename specified")), NULL); return FALSE; } sink->file = fopen (sink->filename, "w"); if (sink->file == NULL) { - gst_element_error (sink, RESOURCE, OPEN_WRITE, + GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (_("Could not open file \"%s\" for writing"), sink->filename), GST_ERROR_SYSTEM); return FALSE; @@ -260,7 +260,7 @@ gst_filesink_close_file (GstFileSink *sink) if (fclose (sink->file) != 0) { - gst_element_error (sink, RESOURCE, CLOSE, + GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, (_("Error closing file \"%s\""), sink->filename), GST_ERROR_SYSTEM); } @@ -327,7 +327,7 @@ gst_filesink_handle_event (GstPad *pad, GstEvent *event) if (GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH) if (fflush (filesink->file)) - gst_element_error (filesink, RESOURCE, WRITE, + GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE, (_("Error while writing to file \"%s\""), filesink->filename), GST_ERROR_SYSTEM); @@ -359,7 +359,7 @@ gst_filesink_handle_event (GstPad *pad, GstEvent *event) } case GST_EVENT_FLUSH: if (fflush (filesink->file)) { - gst_element_error (filesink, RESOURCE, WRITE, + GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE, (_("Error while writing to file \"%s\""), filesink->filename), GST_ERROR_SYSTEM); } @@ -411,7 +411,7 @@ gst_filesink_chain (GstPad *pad, GstData *_data) GST_BUFFER_SIZE (buf) - bytes_written, filesink->file); if (wrote <= 0) { - gst_element_error (filesink, RESOURCE, WRITE, + GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE, (_("Error while writing to file \"%s\""), filesink->filename), ("Only %d of %d bytes written: %s", bytes_written, GST_BUFFER_SIZE (buf), diff --git a/gst/elements/gstfilesrc.c b/gst/elements/gstfilesrc.c index 569fa42..dab1fd4 100644 --- a/gst/elements/gstfilesrc.c +++ b/gst/elements/gstfilesrc.c @@ -394,7 +394,7 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size) mmapregion = mmap (NULL, size, PROT_READ, MAP_SHARED, src->fd, offset); if (mmapregion == NULL) { - gst_element_error (src, RESOURCE, TOO_LAZY, + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, ("mmap call failed")); return NULL; @@ -641,13 +641,13 @@ gst_filesrc_get_read (GstFileSrc *src) ret = read (src->fd, GST_BUFFER_DATA (buf), readsize); if (ret < 0){ - gst_element_error (src, RESOURCE, READ, + GST_ELEMENT_ERROR (src, RESOURCE, READ, NULL, GST_ERROR_SYSTEM); return NULL; } if (ret < readsize) { - gst_element_error (src, RESOURCE, READ, + GST_ELEMENT_ERROR (src, RESOURCE, READ, NULL, ("unexpected end of file")); return NULL; @@ -725,7 +725,7 @@ gst_filesrc_open_file (GstFileSrc *src) if (src->filename == NULL) { - gst_element_error (src, RESOURCE, NOT_FOUND, + GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, (_("No filename specified")), NULL); return FALSE; @@ -733,7 +733,7 @@ gst_filesrc_open_file (GstFileSrc *src) if (src->filename == NULL) { - gst_element_error (src, RESOURCE, NOT_FOUND, + GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, (_("No file specified for reading")), NULL); return FALSE; @@ -747,9 +747,9 @@ gst_filesrc_open_file (GstFileSrc *src) if (src->fd < 0) { if (errno == ENOENT) - gst_element_error (src, RESOURCE, NOT_FOUND, NULL, NULL); + GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, NULL, NULL); else - gst_element_error (src, RESOURCE, OPEN_READ, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("Could not open file \"%s\" for reading"), src->filename), GST_ERROR_SYSTEM); return FALSE; @@ -760,7 +760,7 @@ gst_filesrc_open_file (GstFileSrc *src) fstat(src->fd, &stat_results); if (!S_ISREG(stat_results.st_mode)) { - gst_element_error (src, RESOURCE, OPEN_READ, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("File \"%s\" isn't a regular file"), src->filename), NULL); close(src->fd); diff --git a/gst/elements/gstidentity.c b/gst/elements/gstidentity.c index b73d32d..e369cdb 100644 --- a/gst/elements/gstidentity.c +++ b/gst/elements/gstidentity.c @@ -166,7 +166,7 @@ gst_identity_chain (GstPad *pad, GstData *_data) identity->error_after--; if (identity->error_after == 0) { gst_buffer_unref (buf); - gst_element_error (identity, CORE, FAILED, + GST_ELEMENT_ERROR (identity, CORE, FAILED, (_("Failed after iterations as requested")), NULL); return; diff --git a/gst/elements/gstmultidisksrc.c b/gst/elements/gstmultidisksrc.c index da788c2..eef3a42 100644 --- a/gst/elements/gstmultidisksrc.c +++ b/gst/elements/gstmultidisksrc.c @@ -240,7 +240,7 @@ gboolean gst_multidisksrc_open_file (GstMultiDiskSrc *src, GstPad *srcpad) src->fd = open ((const char *) src->currentfilename, O_RDONLY); if (src->fd < 0) { - gst_element_error (src, RESOURCE, OPEN_READ, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("Could not open file \"%s\" for reading"), src->currentfilename), GST_ERROR_SYSTEM); return FALSE; @@ -255,7 +255,7 @@ gboolean gst_multidisksrc_open_file (GstMultiDiskSrc *src, GstPad *srcpad) /* collapse state if that failed */ if (src->map == NULL) { close (src->fd); - gst_element_error (src, RESOURCE, TOO_LAZY, + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, ("mmap call failed")); return FALSE; diff --git a/gst/elements/gstmultifilesrc.c b/gst/elements/gstmultifilesrc.c index da788c2..eef3a42 100644 --- a/gst/elements/gstmultifilesrc.c +++ b/gst/elements/gstmultifilesrc.c @@ -240,7 +240,7 @@ gboolean gst_multidisksrc_open_file (GstMultiDiskSrc *src, GstPad *srcpad) src->fd = open ((const char *) src->currentfilename, O_RDONLY); if (src->fd < 0) { - gst_element_error (src, RESOURCE, OPEN_READ, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("Could not open file \"%s\" for reading"), src->currentfilename), GST_ERROR_SYSTEM); return FALSE; @@ -255,7 +255,7 @@ gboolean gst_multidisksrc_open_file (GstMultiDiskSrc *src, GstPad *srcpad) /* collapse state if that failed */ if (src->map == NULL) { close (src->fd); - gst_element_error (src, RESOURCE, TOO_LAZY, + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, ("mmap call failed")); return FALSE; diff --git a/gst/elements/gstpipefilter.c b/gst/elements/gstpipefilter.c index 04ff134..fc4402a 100644 --- a/gst/elements/gstpipefilter.c +++ b/gst/elements/gstpipefilter.c @@ -169,7 +169,7 @@ gst_pipefilter_get (GstPad *pad) readbytes = read(pipefilter->fdout[0], GST_BUFFER_DATA(newbuf), pipefilter->bytes_per_read); GST_DEBUG ("read %ld bytes", readbytes); if (readbytes < 0) { - gst_element_error (pipefilter, RESOURCE, READ, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (pipefilter, RESOURCE, READ, NULL, GST_ERROR_SYSTEM); return NULL; } /* if we didn't get as many bytes as we asked for, we're at EOF */ @@ -212,7 +212,7 @@ gst_pipefilter_chain (GstPad *pad,GstData *_data) writebytes = write(pipefilter->fdin[1],data,size); GST_DEBUG ("written %ld bytes", writebytes); if (writebytes < 0) { - gst_element_error (pipefilter, RESOURCE, WRITE, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (pipefilter, RESOURCE, WRITE, NULL, GST_ERROR_SYSTEM); return; } gst_buffer_unref(buf); @@ -267,7 +267,7 @@ gst_pipefilter_open_file (GstPipefilter *src) if((src->childpid = fork()) == -1) { - gst_element_error (src, RESOURCE, TOO_LAZY, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, GST_ERROR_SYSTEM); return FALSE; } @@ -280,7 +280,7 @@ gst_pipefilter_open_file (GstPipefilter *src) dup2(src->fdout[1], STDOUT_FILENO); /* set the childs output stream */ execvp(src->command[0], &src->command[0]); /* will only be reached if execvp has an error */ - gst_element_error (src, RESOURCE, TOO_LAZY, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, GST_ERROR_SYSTEM); return FALSE; } diff --git a/gst/elements/gsttypefind.c b/gst/elements/gsttypefind.c index 5c94666..926002c 100644 --- a/gst/elements/gsttypefind.c +++ b/gst/elements/gsttypefind.c @@ -555,7 +555,7 @@ gst_type_find_element_chain (GstPad *pad, GstData *data) if (typefind->caps) { stop_typefinding (typefind); } else if (typefind->possibilities == NULL) { - gst_element_error (typefind, STREAM, TYPE_NOT_FOUND, + GST_ELEMENT_ERROR (typefind, STREAM, TYPE_NOT_FOUND, NULL, NULL); } else { /* set up typefind element for next iteration */ diff --git a/gst/gstelement.h b/gst/gstelement.h index 67ec0b9..e8e9562 100644 --- a/gst/gstelement.h +++ b/gst/gstelement.h @@ -139,7 +139,7 @@ typedef enum { #define GST_ELEMENT_CLOCK(obj) (((GstElement*)(obj))->clock) #define GST_ELEMENT_PADS(obj) ((obj)->pads) -#define gst_element_error(el, domain, code, message, debug) G_STMT_START { \ +#define GST_ELEMENT_ERROR(el, domain, code, message, debug) G_STMT_START { \ gst_element_error_full (GST_ELEMENT(el), \ GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code, \ _gst_element_error_printf message, \ diff --git a/gst/gstpad.c b/gst/gstpad.c index 5ea3281..b8f884e 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -2255,7 +2255,7 @@ gst_pad_set_explicit_caps (GstPad *pad, const GstCaps *caps) } link_ret = gst_pad_try_set_caps (pad, caps); if (link_ret == GST_PAD_LINK_REFUSED) { - gst_element_error (gst_pad_get_parent (pad), CORE, PAD, + GST_ELEMENT_ERROR (gst_pad_get_parent (pad), CORE, PAD, NULL, ("failed to negotiate (try_set_caps returned REFUSED)")); return FALSE; @@ -2633,7 +2633,7 @@ gst_pad_recover_caps_error (GstPad *pad, const GstCaps *allowed) /* report error */ parent = gst_pad_get_parent (pad); - gst_element_error (parent, CORE, PAD, + GST_ELEMENT_ERROR (parent, CORE, PAD, NULL, ("negotiation failed on pad %s:%s", GST_DEBUG_PAD_NAME (pad))); #endif @@ -2939,7 +2939,7 @@ gst_pad_pull (GstPad *pad) peer = GST_RPAD_PEER (pad); if (!peer) { - gst_element_error (GST_PAD_PARENT (pad), CORE, PAD, NULL, + GST_ELEMENT_ERROR (GST_PAD_PARENT (pad), CORE, PAD, NULL, ("pull on pad %s:%s but it was unlinked", GST_DEBUG_PAD_NAME (pad))); } else { @@ -2961,10 +2961,10 @@ restart: } /* no null buffers allowed */ - gst_element_error (GST_PAD_PARENT (pad), CORE, PAD, NULL, + GST_ELEMENT_ERROR (GST_PAD_PARENT (pad), CORE, PAD, NULL, ("NULL buffer during pull on %s:%s", GST_DEBUG_PAD_NAME (pad))); } else { - gst_element_error (GST_PAD_PARENT (pad), CORE, PAD, NULL, + GST_ELEMENT_ERROR (GST_PAD_PARENT (pad), CORE, PAD, NULL, ("pull on pad %s:%s but the peer pad %s:%s has no gethandler", GST_DEBUG_PAD_NAME (pad), GST_DEBUG_PAD_NAME (peer))); } diff --git a/gst/gstqueue.c b/gst/gstqueue.c index 3f81a98..d17a7e1 100644 --- a/gst/gstqueue.c +++ b/gst/gstqueue.c @@ -561,7 +561,7 @@ restart: if (!queue->may_deadlock) { g_mutex_unlock (queue->qlock); gst_data_unref (data); - gst_element_error (queue, CORE, THREAD, NULL, + GST_ELEMENT_ERROR (queue, CORE, THREAD, NULL, ("deadlock found, shutting down source pad elements")); /* we don't go to out_unref here, since we want to * unref the buffer *before* calling GST_ELEMENT_ERROR */ @@ -676,7 +676,7 @@ restart: /* this means the other end is shut down */ if (!queue->may_deadlock) { g_mutex_unlock (queue->qlock); - gst_element_error (queue, CORE, THREAD, NULL, + GST_ELEMENT_ERROR (queue, CORE, THREAD, NULL, ("deadlock found, shutting down sink pad elements")); goto restart; } else { diff --git a/gst/schedulers/gstbasicscheduler.c b/gst/schedulers/gstbasicscheduler.c index e988f1c..b71858c 100644 --- a/gst/schedulers/gstbasicscheduler.c +++ b/gst/schedulers/gstbasicscheduler.c @@ -460,7 +460,7 @@ gst_basic_scheduler_chainhandler_proxy (GstPad * pad, GstData * data) } if (loop_count == 0) { - gst_element_error (parent, CORE, SCHEDULER, NULL, + GST_ELEMENT_ERROR (parent, CORE, SCHEDULER, NULL, ("(internal error) basic: maximum number of switches exceeded")); return; } @@ -528,7 +528,7 @@ gst_basic_scheduler_gethandler_proxy (GstPad * pad) GST_CAT_DEBUG (debug_dataflow, "new pad in mid-switch!"); pad = (GstPad *) GST_RPAD_PEER (peer); if (!pad) { - gst_element_error (parent, CORE, PAD, NULL, ("pad unlinked")); + GST_ELEMENT_ERROR (parent, CORE, PAD, NULL, ("pad unlinked")); } parent = GST_PAD_PARENT (pad); peer = GST_RPAD_PEER (pad); @@ -659,7 +659,7 @@ gst_basic_scheduler_cothreaded_chain (GstBin * bin, GstSchedulerChain * chain) * either, we have an error */ if (different_sched && !peer_decoupled) { - gst_element_error (element, CORE, SCHEDULER, NULL, + GST_ELEMENT_ERROR (element, CORE, SCHEDULER, NULL, ("element \"%s\" is not decoupled but has pads in different schedulers", GST_ELEMENT_NAME (element))); return FALSE; @@ -727,7 +727,7 @@ gst_basic_scheduler_cothreaded_chain (GstBin * bin, GstSchedulerChain * chain) chain->sched->context, wrapper_function, 0, (char **) element); if (GST_ELEMENT_THREADSTATE (element) == NULL) { - gst_element_error (element, RESOURCE, TOO_LAZY, NULL, ("could not create cothread for \"%s\"", + GST_ELEMENT_ERROR (element, RESOURCE, TOO_LAZY, NULL, ("could not create cothread for \"%s\"", GST_ELEMENT_NAME (element))); return FALSE; } diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c index ece69de..34eace7 100644 --- a/plugins/elements/gstfakesink.c +++ b/plugins/elements/gstfakesink.c @@ -391,7 +391,7 @@ gst_fakesink_change_state (GstElement *element) return GST_STATE_SUCCESS; error: - gst_element_error (element, CORE, STATE_CHANGE, + GST_ELEMENT_ERROR (element, CORE, STATE_CHANGE, NULL, NULL); return GST_STATE_FAILURE; } diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c index aeb2d33..32e5481 100644 --- a/plugins/elements/gstfilesink.c +++ b/plugins/elements/gstfilesink.c @@ -233,14 +233,14 @@ gst_filesink_open_file (GstFileSink *sink) /* open the file */ if (!sink->filename) { - gst_element_error (sink, RESOURCE, NOT_FOUND, + GST_ELEMENT_ERROR (sink, RESOURCE, NOT_FOUND, (_("No filename specified")), NULL); return FALSE; } sink->file = fopen (sink->filename, "w"); if (sink->file == NULL) { - gst_element_error (sink, RESOURCE, OPEN_WRITE, + GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (_("Could not open file \"%s\" for writing"), sink->filename), GST_ERROR_SYSTEM); return FALSE; @@ -260,7 +260,7 @@ gst_filesink_close_file (GstFileSink *sink) if (fclose (sink->file) != 0) { - gst_element_error (sink, RESOURCE, CLOSE, + GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, (_("Error closing file \"%s\""), sink->filename), GST_ERROR_SYSTEM); } @@ -327,7 +327,7 @@ gst_filesink_handle_event (GstPad *pad, GstEvent *event) if (GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH) if (fflush (filesink->file)) - gst_element_error (filesink, RESOURCE, WRITE, + GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE, (_("Error while writing to file \"%s\""), filesink->filename), GST_ERROR_SYSTEM); @@ -359,7 +359,7 @@ gst_filesink_handle_event (GstPad *pad, GstEvent *event) } case GST_EVENT_FLUSH: if (fflush (filesink->file)) { - gst_element_error (filesink, RESOURCE, WRITE, + GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE, (_("Error while writing to file \"%s\""), filesink->filename), GST_ERROR_SYSTEM); } @@ -411,7 +411,7 @@ gst_filesink_chain (GstPad *pad, GstData *_data) GST_BUFFER_SIZE (buf) - bytes_written, filesink->file); if (wrote <= 0) { - gst_element_error (filesink, RESOURCE, WRITE, + GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE, (_("Error while writing to file \"%s\""), filesink->filename), ("Only %d of %d bytes written: %s", bytes_written, GST_BUFFER_SIZE (buf), diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c index 569fa42..dab1fd4 100644 --- a/plugins/elements/gstfilesrc.c +++ b/plugins/elements/gstfilesrc.c @@ -394,7 +394,7 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size) mmapregion = mmap (NULL, size, PROT_READ, MAP_SHARED, src->fd, offset); if (mmapregion == NULL) { - gst_element_error (src, RESOURCE, TOO_LAZY, + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, ("mmap call failed")); return NULL; @@ -641,13 +641,13 @@ gst_filesrc_get_read (GstFileSrc *src) ret = read (src->fd, GST_BUFFER_DATA (buf), readsize); if (ret < 0){ - gst_element_error (src, RESOURCE, READ, + GST_ELEMENT_ERROR (src, RESOURCE, READ, NULL, GST_ERROR_SYSTEM); return NULL; } if (ret < readsize) { - gst_element_error (src, RESOURCE, READ, + GST_ELEMENT_ERROR (src, RESOURCE, READ, NULL, ("unexpected end of file")); return NULL; @@ -725,7 +725,7 @@ gst_filesrc_open_file (GstFileSrc *src) if (src->filename == NULL) { - gst_element_error (src, RESOURCE, NOT_FOUND, + GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, (_("No filename specified")), NULL); return FALSE; @@ -733,7 +733,7 @@ gst_filesrc_open_file (GstFileSrc *src) if (src->filename == NULL) { - gst_element_error (src, RESOURCE, NOT_FOUND, + GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, (_("No file specified for reading")), NULL); return FALSE; @@ -747,9 +747,9 @@ gst_filesrc_open_file (GstFileSrc *src) if (src->fd < 0) { if (errno == ENOENT) - gst_element_error (src, RESOURCE, NOT_FOUND, NULL, NULL); + GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, NULL, NULL); else - gst_element_error (src, RESOURCE, OPEN_READ, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("Could not open file \"%s\" for reading"), src->filename), GST_ERROR_SYSTEM); return FALSE; @@ -760,7 +760,7 @@ gst_filesrc_open_file (GstFileSrc *src) fstat(src->fd, &stat_results); if (!S_ISREG(stat_results.st_mode)) { - gst_element_error (src, RESOURCE, OPEN_READ, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("File \"%s\" isn't a regular file"), src->filename), NULL); close(src->fd); diff --git a/plugins/elements/gstidentity.c b/plugins/elements/gstidentity.c index b73d32d..e369cdb 100644 --- a/plugins/elements/gstidentity.c +++ b/plugins/elements/gstidentity.c @@ -166,7 +166,7 @@ gst_identity_chain (GstPad *pad, GstData *_data) identity->error_after--; if (identity->error_after == 0) { gst_buffer_unref (buf); - gst_element_error (identity, CORE, FAILED, + GST_ELEMENT_ERROR (identity, CORE, FAILED, (_("Failed after iterations as requested")), NULL); return; diff --git a/plugins/elements/gstmultidisksrc.c b/plugins/elements/gstmultidisksrc.c index da788c2..eef3a42 100644 --- a/plugins/elements/gstmultidisksrc.c +++ b/plugins/elements/gstmultidisksrc.c @@ -240,7 +240,7 @@ gboolean gst_multidisksrc_open_file (GstMultiDiskSrc *src, GstPad *srcpad) src->fd = open ((const char *) src->currentfilename, O_RDONLY); if (src->fd < 0) { - gst_element_error (src, RESOURCE, OPEN_READ, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("Could not open file \"%s\" for reading"), src->currentfilename), GST_ERROR_SYSTEM); return FALSE; @@ -255,7 +255,7 @@ gboolean gst_multidisksrc_open_file (GstMultiDiskSrc *src, GstPad *srcpad) /* collapse state if that failed */ if (src->map == NULL) { close (src->fd); - gst_element_error (src, RESOURCE, TOO_LAZY, + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, ("mmap call failed")); return FALSE; diff --git a/plugins/elements/gstmultifilesrc.c b/plugins/elements/gstmultifilesrc.c index da788c2..eef3a42 100644 --- a/plugins/elements/gstmultifilesrc.c +++ b/plugins/elements/gstmultifilesrc.c @@ -240,7 +240,7 @@ gboolean gst_multidisksrc_open_file (GstMultiDiskSrc *src, GstPad *srcpad) src->fd = open ((const char *) src->currentfilename, O_RDONLY); if (src->fd < 0) { - gst_element_error (src, RESOURCE, OPEN_READ, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("Could not open file \"%s\" for reading"), src->currentfilename), GST_ERROR_SYSTEM); return FALSE; @@ -255,7 +255,7 @@ gboolean gst_multidisksrc_open_file (GstMultiDiskSrc *src, GstPad *srcpad) /* collapse state if that failed */ if (src->map == NULL) { close (src->fd); - gst_element_error (src, RESOURCE, TOO_LAZY, + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, ("mmap call failed")); return FALSE; diff --git a/plugins/elements/gstpipefilter.c b/plugins/elements/gstpipefilter.c index 04ff134..fc4402a 100644 --- a/plugins/elements/gstpipefilter.c +++ b/plugins/elements/gstpipefilter.c @@ -169,7 +169,7 @@ gst_pipefilter_get (GstPad *pad) readbytes = read(pipefilter->fdout[0], GST_BUFFER_DATA(newbuf), pipefilter->bytes_per_read); GST_DEBUG ("read %ld bytes", readbytes); if (readbytes < 0) { - gst_element_error (pipefilter, RESOURCE, READ, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (pipefilter, RESOURCE, READ, NULL, GST_ERROR_SYSTEM); return NULL; } /* if we didn't get as many bytes as we asked for, we're at EOF */ @@ -212,7 +212,7 @@ gst_pipefilter_chain (GstPad *pad,GstData *_data) writebytes = write(pipefilter->fdin[1],data,size); GST_DEBUG ("written %ld bytes", writebytes); if (writebytes < 0) { - gst_element_error (pipefilter, RESOURCE, WRITE, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (pipefilter, RESOURCE, WRITE, NULL, GST_ERROR_SYSTEM); return; } gst_buffer_unref(buf); @@ -267,7 +267,7 @@ gst_pipefilter_open_file (GstPipefilter *src) if((src->childpid = fork()) == -1) { - gst_element_error (src, RESOURCE, TOO_LAZY, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, GST_ERROR_SYSTEM); return FALSE; } @@ -280,7 +280,7 @@ gst_pipefilter_open_file (GstPipefilter *src) dup2(src->fdout[1], STDOUT_FILENO); /* set the childs output stream */ execvp(src->command[0], &src->command[0]); /* will only be reached if execvp has an error */ - gst_element_error (src, RESOURCE, TOO_LAZY, NULL, GST_ERROR_SYSTEM); + GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, NULL, GST_ERROR_SYSTEM); return FALSE; } diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index 3f81a98..d17a7e1 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -561,7 +561,7 @@ restart: if (!queue->may_deadlock) { g_mutex_unlock (queue->qlock); gst_data_unref (data); - gst_element_error (queue, CORE, THREAD, NULL, + GST_ELEMENT_ERROR (queue, CORE, THREAD, NULL, ("deadlock found, shutting down source pad elements")); /* we don't go to out_unref here, since we want to * unref the buffer *before* calling GST_ELEMENT_ERROR */ @@ -676,7 +676,7 @@ restart: /* this means the other end is shut down */ if (!queue->may_deadlock) { g_mutex_unlock (queue->qlock); - gst_element_error (queue, CORE, THREAD, NULL, + GST_ELEMENT_ERROR (queue, CORE, THREAD, NULL, ("deadlock found, shutting down sink pad elements")); goto restart; } else { diff --git a/plugins/elements/gsttypefind.c b/plugins/elements/gsttypefind.c index 5c94666..926002c 100644 --- a/plugins/elements/gsttypefind.c +++ b/plugins/elements/gsttypefind.c @@ -555,7 +555,7 @@ gst_type_find_element_chain (GstPad *pad, GstData *data) if (typefind->caps) { stop_typefinding (typefind); } else if (typefind->possibilities == NULL) { - gst_element_error (typefind, STREAM, TYPE_NOT_FOUND, + GST_ELEMENT_ERROR (typefind, STREAM, TYPE_NOT_FOUND, NULL, NULL); } else { /* set up typefind element for next iteration */ -- 2.7.4