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/libdts | |
| 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/libdts')
| -rw-r--r-- | src/libdts/decoder.c | 10 | ||||
| -rw-r--r-- | src/libdts/print_info.c | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/libdts/decoder.c b/src/libdts/decoder.c index 724d61927..6023366b4 100644 --- a/src/libdts/decoder.c +++ b/src/libdts/decoder.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: decoder.c,v 1.1 2003/08/05 11:30:56 jcdutton Exp $ + * $Id: decoder.c,v 1.2 2003/12/07 15:34:30 f1rmb Exp $ * * 04-08-2003 DTS software decode (C) James Courtier-Dutton * @@ -80,7 +80,7 @@ static uint32_t getbits(getbits_state_t *state, uint32_t number_of_bits) { uint8_t byte=0; if (number_of_bits > 32) { printf("Number of bits > 32 in getbits\n"); - assert(0); + abort(); } if ((state->bit_position) > 0) { /* Last getbits left us in the middle of a byte. */ @@ -447,7 +447,8 @@ void dts_parse_data (dts_decoder_t *this, buf_element_t *buf) { if (decoder_data.nQSelect == 6) { decoder_data.bit_allocation_index[ch][n] = getbits(&state,5); } else { - XINE_ASSERT(0, "bit_alloc parse failed, (nQSelect != 6) not implemented yet."); + printf("bit_alloc parse failed, (nQSelect != 6) not implemented yet."); + abort(); } /*QABITS.ppQ[nQSelect]->InverseQ(&state, bit_allocation_index[ch][n]); */ @@ -476,7 +477,8 @@ void dts_parse_data (dts_decoder_t *this, buf_element_t *buf) { if (decoder_data.nQSelect == 0) { decoder_data.transition_mode[ch][n] = huff_lookup(&state, HuffA4); } else { - XINE_ASSERT(0, "transition mod parse failed, (nQSelect != 0) not implemented yet."); + printf("transition mod parse failed, (nQSelect != 0) not implemented yet."); + abort(); } /* QTMODE.ppQ[nQSelect]->InverseQ(&state,transition_mode[ch][n]); */ diff --git a/src/libdts/print_info.c b/src/libdts/print_info.c index d6d45d86d..50bd75098 100644 --- a/src/libdts/print_info.c +++ b/src/libdts/print_info.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: print_info.c,v 1.1 2003/08/05 11:30:56 jcdutton Exp $ + * $Id: print_info.c,v 1.2 2003/12/07 15:34:30 f1rmb Exp $ * * 04-08-2003 DTS software decode (C) James Courtier-Dutton * @@ -213,9 +213,9 @@ void dts_print_decoded_data(decoder_data_t *decoder_data) { #endif -XINE_ASSERT(0, "Parse exited as required!"); + printf("Parse exited as required!"); + abort(); -return; + return; } #endif - |