diff options
author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-03-03 20:09:11 +0000 |
---|---|---|
committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-03-03 20:09:11 +0000 |
commit | 7cf5530ea749f274bb984e9a9f2c82e426cca645 (patch) | |
tree | 62f784baf42e7dbd0cb28865539803759827fa79 /src/xine-engine | |
parent | 6ffb59a745a36b7884e6305c7420e57d87dd894d (diff) | |
download | xine-lib-7cf5530ea749f274bb984e9a9f2c82e426cca645.tar.gz xine-lib-7cf5530ea749f274bb984e9a9f2c82e426cca645.tar.bz2 |
use the _x_abort() macro instead of abort, since it prints some debug info
before aborting
CVS patchset: 6211
CVS date: 2004/03/03 20:09:11
Diffstat (limited to 'src/xine-engine')
-rw-r--r-- | src/xine-engine/audio_decoder.c | 6 | ||||
-rw-r--r-- | src/xine-engine/audio_out.c | 6 | ||||
-rw-r--r-- | src/xine-engine/broadcaster.c | 6 | ||||
-rw-r--r-- | src/xine-engine/buffer.c | 6 | ||||
-rw-r--r-- | src/xine-engine/configfile.c | 8 | ||||
-rw-r--r-- | src/xine-engine/demux.c | 4 | ||||
-rw-r--r-- | src/xine-engine/events.c | 6 | ||||
-rw-r--r-- | src/xine-engine/load_plugins.c | 14 | ||||
-rw-r--r-- | src/xine-engine/video_decoder.c | 6 | ||||
-rw-r--r-- | src/xine-engine/video_out.c | 6 | ||||
-rw-r--r-- | src/xine-engine/xine.c | 12 | ||||
-rw-r--r-- | src/xine-engine/xine_interface.c | 6 |
12 files changed, 43 insertions, 43 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index e6c6411f3..ff1d01314 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.c,v 1.120 2004/02/12 18:19:12 mroi Exp $ + * $Id: audio_decoder.c,v 1.121 2004/03/03 20:09:18 mroi Exp $ * * * functions that implement audio decoding @@ -438,7 +438,7 @@ void _x_audio_decoder_init (xine_stream_t *stream) { &pth_attrs, audio_decoder_loop, stream)) != 0) { xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "audio_decoder: can't create new thread (%s)\n", strerror(err)); - abort(); + _x_abort(); } pthread_attr_destroy(&pth_attrs); diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 099f5462d..3273d3f55 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.163 2004/02/12 18:09:19 mroi Exp $ + * $Id: audio_out.c,v 1.164 2004/03/03 20:09:16 mroi Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -1945,7 +1945,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, "audio_out: can't create thread (%s)\n", strerror(err)); xprintf (this->xine, XINE_VERBOSITY_LOG, _("audio_out: sorry, this should not happen. please restart xine.\n")); - abort(); + _x_abort(); } else xprintf (this->xine, XINE_VERBOSITY_DEBUG, "thread created\n"); diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c index 4e0b4142e..95fa1cb9e 100644 --- a/src/xine-engine/broadcaster.c +++ b/src/xine-engine/broadcaster.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * May 2003 - Miguel Freitas * This feature was sponsored by 1Control * @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: broadcaster.c,v 1.5 2003/12/05 15:55:04 f1rmb Exp $ + * $Id: broadcaster.c,v 1.6 2004/03/03 20:09:16 mroi Exp $ * * broadcaster.c - xine network broadcaster * @@ -335,7 +335,7 @@ broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port) NULL, manager_loop, (void *)this)) != 0) { xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "broadcaster: can't create new thread (%s)\n", strerror(err)); - abort(); + _x_abort(); } return this; diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c index 1f7c896d6..4bf3f5fc9 100644 --- a/src/xine-engine/buffer.c +++ b/src/xine-engine/buffer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer.c,v 1.34 2003/12/07 15:34:30 f1rmb Exp $ + * $Id: buffer.c,v 1.35 2004/03/03 20:09:16 mroi Exp $ * * * contents: @@ -65,7 +65,7 @@ static void buffer_pool_free (buf_element_t *element) { this->buffer_pool_num_free++; if (this->buffer_pool_num_free > this->buffer_pool_capacity) { printf("xine-lib:buffer: Their has been a fatal error: TOO MANY FREE's\n"); - abort(); + _x_abort(); } pthread_cond_signal (&this->buffer_pool_cond_not_empty); diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index e30d59994..87791acb0 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: configfile.c,v 1.61 2004/01/16 23:03:38 f1rmb Exp $ + * $Id: configfile.c,v 1.62 2004/03/03 20:09:16 mroi Exp $ * * config object (was: file) management - implementation * @@ -709,7 +709,7 @@ void xine_config_load (xine_t *xine, const char *filename) { break; default: printf ("xine_interface: error, unknown config entry type %d\n", entry->type); - abort(); + _x_abort(); } } } @@ -940,7 +940,7 @@ config_values_t *_x_config_init (void) { if (!(this = xine_xmalloc(sizeof(config_values_t)))) { printf ("configfile: could not allocate config object\n"); - abort(); + _x_abort(); } this->first = NULL; diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 3aeb292f0..716b4e974 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -20,7 +20,7 @@ * Demuxer helper functions * hide some xine engine details from demuxers and reduce code duplication * - * $Id: demux.c,v 1.46 2004/02/12 18:19:44 mroi Exp $ + * $Id: demux.c,v 1.47 2004/03/03 20:09:16 mroi Exp $ */ @@ -299,7 +299,7 @@ int _x_demux_start_thread (xine_stream_t *stream) { if ((err = pthread_create (&stream->demux_thread, NULL, demux_loop, (void *)stream)) != 0) { printf ("demux: can't create new thread (%s)\n", strerror(err)); - abort(); + _x_abort(); } } diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c index 0d77bd9d7..3470db749 100644 --- a/src/xine-engine/events.c +++ b/src/xine-engine/events.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: events.c,v 1.22 2003/12/09 00:02:36 f1rmb Exp $ + * $Id: events.c,v 1.23 2004/03/03 20:09:16 mroi Exp $ * * Event handling functions * @@ -220,6 +220,6 @@ void xine_event_create_listener_thread (xine_event_queue_t *queue, NULL, listener_loop, queue)) != 0) { xprintf (queue->stream->xine, XINE_VERBOSITY_DEBUG, "events: can't create new thread (%s)\n", strerror(err)); - abort(); + _x_abort(); } } diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index e484a58a2..94d8e62f2 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: load_plugins.c,v 1.172 2004/02/12 18:23:35 mroi Exp $ + * $Id: load_plugins.c,v 1.173 2004/03/03 20:09:17 mroi Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -76,7 +76,7 @@ static void segv_handler (int hubba) { printf ("\nload_plugins: Initialization of plugin '%s' failed (segmentation fault).\n",plugin_name); printf ("load_plugins: You probably need to remove the offending file.\n"); printf ("load_plugins: (This error is usually due an incorrect plugin version)\n"); - abort(); + _x_abort(); } static void install_segv_handler(void){ @@ -348,7 +348,7 @@ static void _insert_plugin (xine_t *this, if (decoder_old == NULL) { xprintf (this, XINE_VERBOSITY_DEBUG, "load_plugins: plugin %s from %s is broken: special_info = NULL\n", info->id, entry->filename); - abort(); + _x_abort(); } for (i=0; decoder_old->supported_types[i] != 0; ++i); types = xine_xmalloc((i+1)*sizeof(uint32_t)); @@ -932,7 +932,7 @@ void _x_scan_plugins (xine_t *this) { if (this == NULL || this->config == NULL) { fprintf(stderr, "%s(%s@%d): parameter should be non null, exiting\n", __FILE__, __XINE_FUNCTION__, __LINE__); - abort(); + _x_abort(); } #endif @@ -1019,7 +1019,7 @@ static demux_plugin_t *probe_demux (xine_stream_t *stream, int method1, int meth if (methods[0] == -1) { xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "load_plugins: probe_demux method1 = %d is not allowed \n", method1); - abort(); + _x_abort(); } i = 0; @@ -1073,7 +1073,7 @@ demux_plugin_t *_x_find_demux_plugin (xine_stream_t *stream, input_plugin_t *inp default: xprintf (stream->xine, XINE_VERBOSITY_LOG, _("load_plugins: unknown content detection strategy %d\n"), stream->xine->demux_strategy); - abort(); + _x_abort(); } return NULL; diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index e9fe388d5..d77681a4c 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.143 2004/02/12 18:19:12 mroi Exp $ + * $Id: video_decoder.c,v 1.144 2004/03/03 20:09:17 mroi Exp $ * */ @@ -419,7 +419,7 @@ void _x_video_decoder_init (xine_stream_t *stream) { &pth_attrs, video_decoder_loop, stream)) != 0) { fprintf (stderr, "video_decoder: can't create new thread (%s)\n", strerror(err)); - abort(); + _x_abort(); } pthread_attr_destroy(&pth_attrs); diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index 706dfeb80..8e45389a4 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out.c,v 1.186 2004/02/19 02:50:26 rockyb Exp $ + * $Id: video_out.c,v 1.187 2004/03/03 20:09:17 mroi Exp $ * * frame allocation / queuing / scheduling / output functions */ @@ -1538,7 +1538,7 @@ xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver, /* FIXME: how does this happen ? */ xprintf (this->xine, XINE_VERBOSITY_LOG, _("video_out: sorry, this should not happen. please restart xine.\n")); - abort(); + _x_abort(); } else xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video_out: thread created\n"); diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 282cc2db3..2630cbb96 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.283 2004/02/16 20:19:10 uid86226 Exp $ + * $Id: xine.c,v 1.284 2004/03/03 20:09:18 mroi Exp $ */ /* @@ -1270,7 +1270,7 @@ xine_t *xine_new (void) { this = xine_xmalloc (sizeof (xine_t)); if (!this) - abort(); + _x_abort(); #ifdef ENABLE_NLS /* @@ -1644,7 +1644,7 @@ int xine_get_current_frame (xine_stream_t *stream, int *width, int *height, default: xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "xine: error, snapshot function not implemented for format 0x%x\n", frame->format); - abort (); + _x_abort (); } } return 1; @@ -1658,7 +1658,7 @@ int xine_get_video_frame (xine_stream_t *stream, int *format, uint8_t *img) { xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "xine: xine_get_video_frame not implemented yet.\n"); - abort (); + _x_abort (); return 0; } @@ -1767,7 +1767,7 @@ const char *const *xine_get_log (xine_t *this, int buf) { void xine_register_log_cb (xine_t *this, xine_log_cb_t cb, void *user_data) { printf ("xine: xine_register_log_cb: not implemented yet.\n"); - abort(); + _x_abort(); } @@ -1777,7 +1777,7 @@ int xine_get_error (xine_stream_t *stream) { int xine_trick_mode (xine_stream_t *stream, int mode, int value) { printf ("xine: xine_trick_mode not implemented yet.\n"); - abort (); + _x_abort (); } int xine_stream_master_slave(xine_stream_t *master, xine_stream_t *slave, diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c index 9ea2ffbd5..81531cb3e 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2003 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_interface.c,v 1.79 2004/02/16 20:19:10 uid86226 Exp $ + * $Id: xine_interface.c,v 1.80 2004/03/03 20:09:18 mroi Exp $ * * convenience/abstraction layer, functions to implement * libxine's public interface @@ -283,7 +283,7 @@ void xine_config_update_entry (xine_t *this, const xine_cfg_entry_t *entry) { default: xprintf (this, XINE_VERBOSITY_DEBUG, "xine_interface: error, unknown config entry type %d\n", entry->type); - abort(); + _x_abort(); } } |