big debug output cleanup. removed debug output from log window, logging

relevant information like stream type/size/bitrate instead.
demuxer cleanup, removed no-longer-needed macros :-)
switched off video_out/libmpeg2/... verbose log output messages.

CVS patchset: 1503
CVS date: 2002/02/17 17:32:49

1 files changed, 9 insertions, 31 deletions

diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c
index 2a5305aee..b8dc3cd55 100644
--- a/src/demuxers/demux_pes.c
+++ b/src/demuxers/demux_pes.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: demux_pes.c,v 1.18 2002/02/09 07:13:23 guenter Exp $
+ * $Id: demux_pes.c,v 1.19 2002/02/17 17:32:50 guenter Exp $
  *
  * demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
  * reads streams of variable blocksizes
@@ -46,26 +46,6 @@
 #define VALID_MRLS          "fifo,stdin"
 #define VALID_ENDS          "vdr"
 
-#ifdef __GNUC__
-#define LOG_MSG_STDERR(xine, message, args...) {                     \
-    xine_log(xine, XINE_LOG_DEMUX, message, ##args);                 \
-    fprintf(stderr, message, ##args);                                \
-  }
-#define LOG_MSG(xine, message, args...) {                            \
-    xine_log(xine, XINE_LOG_DEMUX, message, ##args);                 \
-    printf(message, ##args);                                         \
-  }
-#else
-#define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
-    fprintf(stderr, __VA_ARGS__);                                    \
-  }
-#define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
-    printf(__VA_ARGS__);                                             \
-  }
-#endif
-
 typedef struct demux_pes_s {
 
   demux_plugin_t       demux_plugin;
@@ -122,8 +102,7 @@ static uint32_t read_bytes (demux_pes_t *this, int n) {
     res = (buf[2]<<8) | buf[3] | (buf[1]<<16) | (buf[0] << 24);
     break;
   default:
-    LOG_MSG_STDERR(this->xine,
-		   _("How how - something wrong in wonderland demux:read_bytes (%d)\n"), n);
+    printf ("demux_pes: how how - something wrong in wonderland demux:read_bytes (%d)\n", n);
     exit (1);
   }
 
@@ -346,7 +325,7 @@ static void *demux_pes_loop (void *this_gen) {
     }
   }
 
-  LOG_MSG(this->xine, _("demux loop finished (status: %d, buf:%x)\n"),
+  printf ("demux_pes: demux loop finished (status: %d, buf:%x)\n",
 	  this->status, w);
 
   pthread_exit(NULL);
@@ -360,7 +339,7 @@ static void demux_pes_stop (demux_plugin_t *this_gen) {
   buf_element_t *buf;
   void *p;
 
-  LOG_MSG(this->xine, _("demux_pes: stop...\n"));
+  printf ("demux_pes: stop...\n");
 
   if (this->status != DEMUX_OK) {
 
@@ -456,8 +435,8 @@ static void demux_pes_start (demux_plugin_t *this_gen,
 
   if ((err = pthread_create (&this->thread,
 			     NULL, demux_pes_loop, this)) != 0) {
-    LOG_MSG_STDERR(this->xine, _("demux_pes: can't create new thread (%s)\n"),
-		   strerror(err));
+    printf ("demux_pes: can't create new thread (%s)\n",
+	    strerror(err));
     exit (1);
   }
 }
@@ -586,10 +565,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_pes_t     *this;
 
   if (iface != 6) {
-    LOG_MSG(xine,
-	    _("demux_pes: plugin doesn't support plugin API version %d.\n"
-	      "           this means there's a version mismatch between xine and this "
-	      "           demuxer plugin.\nInstalling current demux plugins should help.\n"),
+    printf ("demux_pes: plugin doesn't support plugin API version %d.\n"
+	    "           this means there's a version mismatch between xine and this "
+	    "           demuxer plugin.\nInstalling current demux plugins should help.\n",
 	    iface);
     return NULL;
   }