diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-12-07 15:34:29 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-12-07 15:34:29 +0000 |
| commit | c8fdff20285b59cd892297317572fbb4c3633f78 (patch) | |
| tree | 102be6141b635eb2bff16358ca13b79924b211f4 /src/audio_out/audio_alsa_out.c | |
| parent | a2dcf860b2777e530646abd00202c3fb5b3a5a81 (diff) | |
| download | xine-lib-c8fdff20285b59cd892297317572fbb4c3633f78.tar.gz xine-lib-c8fdff20285b59cd892297317572fbb4c3633f78.tar.bz2 | |
get rid of XINE_{ASSERT,ABORT} and useless xine_print_trace (useless). Replace XINE_ASSERT by _x_assert, which works exaclty as assert, except that it still warns with NDEBUG defined (but don't abort). Fix missuning of assert(0), which isn't safe, abort is abort, assert is for debugging purpose only, so all assert(0) has been converted to abort() alls. In osd_preload_fonts(): alloc needed memory chunk. Define NDEBUG in CFLAGS, for non DEBUG build only.
CVS patchset: 5860
CVS date: 2003/12/07 15:34:29
Diffstat (limited to 'src/audio_out/audio_alsa_out.c')
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 890a0e280..87ac533b9 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -26,7 +26,7 @@ * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk> * * - * $Id: audio_alsa_out.c,v 1.119 2003/12/05 15:54:56 f1rmb Exp $ + * $Id: audio_alsa_out.c,v 1.120 2003/12/07 15:34:29 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -720,7 +720,9 @@ static int ao_alsa_write(ao_driver_t *this_gen, int16_t *data, uint32_t count) { #endif if ((res = snd_pcm_prepare(this->audio_fd))<0) { return 0; - XINE_ASSERT (0,"audio_alsa_out: xrun: prepare error: %s", snd_strerror(res)); + xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, + "audio_alsa_out: xrun: prepare error: %s", snd_strerror(res)); + abort(); } state = snd_pcm_state(this->audio_fd); #ifdef LOG_DEBUG @@ -762,7 +764,9 @@ static int ao_alsa_write(ao_driver_t *this_gen, int16_t *data, uint32_t count) { xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, "audio_alsa_out:write:BAD STATE2, state = %d, going to try XRUN\n",state); if ((res = snd_pcm_prepare(this->audio_fd))<0) { - XINE_ASSERT(0, "audio_alsa_out: xrun: prepare error: %s", snd_strerror(res)); + xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, + "audio_alsa_out: xrun: prepare error: %s", snd_strerror(res)); + abort(); } } } |