[xine-cvs] CVS: xine-lib/src/libtheora xine_decoder.c,1.14,1.15

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

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

Modified Files:
	xine_decoder.c 
Log Message:
lprintf cleanup, pass I.

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libtheora/xine_decoder.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xine_decoder.c	23 Oct 2003 20:12:33 -0000	1.14
+++ xine_decoder.c	26 Nov 2003 19:43:36 -0000	1.15
@@ -35,16 +35,19 @@
 #include <math.h>
 #include <assert.h>
 #include <theora/theora.h>
+
+#define LOG_MODULE "theora_decoder"
+#define LOG_VERBOSE
+/*
+#define LOG
+*/
+
 #include "xine_internal.h"
 #include "video_out.h"
 #include "buffer.h"
 #include "metronom.h"
 #include "xineutils.h"
 
-/*
-#define LOG
-*/
-
 typedef struct theora_class_s {
   video_decoder_class_t   decoder_class;
 } theora_class_t;
@@ -184,16 +187,16 @@
     if (this->hp_read==3) {
       /*headers are now decoded. initialize the decoder*/
       theora_decode_init (&this->t_state, &this->t_info);
-#ifdef LOG
-      printf("libtheora: theora stream is Theora %dx%d %.02f fps video.\n"
-	     "           frame content is %dx%d with offset (%d,%d).\n"
-	     "           pixel aspect is %d:%d.\n",
-	     this->t_info.width,this->t_info.height,
-	     (double)this->t_info.fps_numerator/this->t_info.fps_denominator,
-	     this->t_info.frame_width, this->t_info.frame_height,
-	     this->t_info.offset_x, this->t_info.offset_y,
-	     this->t_info.aspect_numerator, this->t_info.aspect_denominator);
-#endif
+      
+      lprintf("theora stream is Theora %dx%d %.02f fps video.\n"
+	      "           frame content is %dx%d with offset (%d,%d).\n"
+	      "           pixel aspect is %d:%d.\n",
+	      this->t_info.width,this->t_info.height,
+	      (double)this->t_info.fps_numerator/this->t_info.fps_denominator,
+	      this->t_info.frame_width, this->t_info.frame_height,
+	      this->t_info.offset_x, this->t_info.offset_y,
+	      this->t_info.aspect_numerator, this->t_info.aspect_denominator);
+
       this->frame_duration=((int64_t)90000*this->t_info.fps_denominator)/this->t_info.fps_numerator;
       this->width=this->t_info.frame_width;
       this->height=this->t_info.frame_height;
@@ -284,9 +287,7 @@
 
   theora_decoder_t *this = (theora_decoder_t *) this_gen;
 
-#ifdef LOG
-  printf ("libtheora: dispose \n");
-#endif
+  lprintf ("dispose \n");
 
   theora_clear (&this->t_state);
   theora_comment_clear (&this->t_comment);