[xine-cvs] CVS: xine-lib/src/libspudec xine_decoder.c,1.102,1.103

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-lib/src/libspudec
In directory sc8-pr-cvs1:/tmp/cvs-serv21525/src/libspudec

Modified Files:
	xine_decoder.c 
Log Message:
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.

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/xine_decoder.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- xine_decoder.c	5 Dec 2003 15:55:00 -0000	1.102
+++ xine_decoder.c	7 Dec 2003 15:34:30 -0000	1.103
@@ -236,8 +236,10 @@
   printf ("libspudec:xine_decoder.c:spudec_event_listener:this=%p\n",this);
   printf ("libspudec:xine_decoder.c:spudec_event_listener:this->menu_handle=%d\n",this->menu_handle);
 #endif
-  XINE_ASSERT(this->menu_handle >= 0, "Menu handle alloc failed. No more overlays objects available. Only 5 at once please.");
-
+  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	  "Menu handle alloc failed. No more overlays objects available. Only 5 at once please.");
+  _x_assert(this->menu_handle >= 0);
+  
   if (show > 0) {
 #ifdef LOG_NAV
     fprintf (stderr,"libspudec:xine_decoder.c:spudec_event_listener:buttonN = %u show=%d\n",
@@ -271,7 +273,8 @@
   } else {
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
 	    "libspudec:xine_decoder.c:spudec_event_listener:HIDE ????\n");
-    XINE_ASSERT(0, "We dropped out here for some reason");
+    printf("We dropped out here for some reason");
+    abort();
     overlay_event->object.handle = this->menu_handle;
     overlay_event->event_type = OVERLAY_EVENT_HIDE;
   }