compatibility fix for new GST_DEBUG stuff.

Original commit message from CVS:
compatibility fix for new GST_DEBUG stuff.
Includes fixes for missing includes for config.h and unistd.h

I only ensured for plugins I can build that they work, so if some of them are still broken, you gotta fix them yourselves unfortunately.

2 files changed, 35 insertions, 29 deletions

diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index fa68d7f7..0e499043 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -18,6 +18,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 
 /*#define DEBUG_ENABLED*/
@@ -88,38 +91,38 @@ gst_jpegdec_class_init (GstJpegDec *klass)
 static void
 gst_jpegdec_init_source (j_decompress_ptr cinfo)
 {
-  GST_DEBUG (0,"gst_jpegdec_chain: init_source");
+  GST_DEBUG ("gst_jpegdec_chain: init_source");
 }
 static gboolean
 gst_jpegdec_fill_input_buffer (j_decompress_ptr cinfo)
 {
-  GST_DEBUG (0,"gst_jpegdec_chain: fill_input_buffer");
+  GST_DEBUG ("gst_jpegdec_chain: fill_input_buffer");
   return TRUE;
 }
 
 static void
 gst_jpegdec_skip_input_data (j_decompress_ptr cinfo, glong num_bytes)
 {
-  GST_DEBUG (0,"gst_jpegdec_chain: skip_input_data");
+  GST_DEBUG ("gst_jpegdec_chain: skip_input_data");
 }
 
 static gboolean
 gst_jpegdec_resync_to_restart (j_decompress_ptr cinfo, gint desired)
 {
-  GST_DEBUG (0,"gst_jpegdec_chain: resync_to_start");
+  GST_DEBUG ("gst_jpegdec_chain: resync_to_start");
   return TRUE;
 }
 
 static void
 gst_jpegdec_term_source (j_decompress_ptr cinfo)
 {
-  GST_DEBUG (0,"gst_jpegdec_chain: term_source");
+  GST_DEBUG ("gst_jpegdec_chain: term_source");
 }
 
 static void
 gst_jpegdec_init (GstJpegDec *jpegdec)
 {
-  GST_DEBUG (0,"gst_jpegdec_init: initializing");
+  GST_DEBUG ("gst_jpegdec_init: initializing");
   /* create the sink and src pads */
   jpegdec->sinkpad = gst_pad_new_from_template (jpegdec_sink_template, "sink");
   gst_element_add_pad(GST_ELEMENT(jpegdec),jpegdec->sinkpad);
@@ -265,7 +268,7 @@ static void guarantee_huff_tables(j_decompress_ptr dinfo)
        (dinfo->dc_huff_tbl_ptrs[1] == NULL) &&
        (dinfo->ac_huff_tbl_ptrs[0] == NULL) &&
        (dinfo->ac_huff_tbl_ptrs[1] == NULL) ) {
-    GST_DEBUG (GST_CAT_PLUGIN_INFO,
+    GST_DEBUG (
 	       "Generating standard Huffman tables for this frame.");
     std_huff_tables(dinfo);
   }
@@ -298,14 +301,14 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
 
   data = (guchar *)GST_BUFFER_DATA(buf);
   size = GST_BUFFER_SIZE(buf);
-  GST_DEBUG (0,"gst_jpegdec_chain: got buffer of %ld bytes in '%s'",size,
+  GST_DEBUG ("gst_jpegdec_chain: got buffer of %ld bytes in '%s'",size,
           GST_OBJECT_NAME (jpegdec));
 
   jpegdec->jsrc.next_input_byte = data;
   jpegdec->jsrc.bytes_in_buffer = size;
 		                  
 
-  GST_DEBUG (0,"gst_jpegdec_chain: reading header %08lx", *(gulong *)data);
+  GST_DEBUG ("gst_jpegdec_chain: reading header %08lx", *(gulong *)data);
   jpeg_read_header(&jpegdec->cinfo, TRUE);
 
   r_h = jpegdec->cinfo.cur_comp_info[0]->h_samp_factor;
@@ -320,12 +323,12 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
   jpegdec->cinfo.out_color_space = JCS_YCbCr;
   jpegdec->cinfo.dct_method = JDCT_IFAST;
   jpegdec->cinfo.raw_data_out = TRUE;
-  GST_DEBUG (0,"gst_jpegdec_chain: starting decompress");
+  GST_DEBUG ("gst_jpegdec_chain: starting decompress");
   guarantee_huff_tables(&jpegdec->cinfo);
   jpeg_start_decompress(&jpegdec->cinfo);
   width = jpegdec->cinfo.output_width;
   height = jpegdec->cinfo.output_height;
-  GST_DEBUG (0,"gst_jpegdec_chain: width %d, height %d", width, height);
+  GST_DEBUG ("gst_jpegdec_chain: width %d, height %d", width, height);
 
   outbuf = gst_buffer_new();
   outsize = GST_BUFFER_SIZE(outbuf) = width*height +
@@ -356,7 +359,7 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
 
   width2 = width >> 1;
 
-  GST_DEBUG (0,"gst_jpegdec_chain: decompressing %u", jpegdec->cinfo.rec_outbuf_height);
+  GST_DEBUG ("gst_jpegdec_chain: decompressing %u", jpegdec->cinfo.rec_outbuf_height);
   for (i = 0; i < height; i += r_v*DCTSIZE) {
     for (j=0, k=0; j< (r_v*DCTSIZE); j += r_v, k++) {
       jpegdec->line[0][j]   = base[0]; base[0] += width;
@@ -373,10 +376,10 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
     jpeg_read_raw_data(&jpegdec->cinfo, jpegdec->line, r_v*DCTSIZE);
   }
 
-  GST_DEBUG (0,"gst_jpegdec_chain: decompressing finished");
+  GST_DEBUG ("gst_jpegdec_chain: decompressing finished");
   jpeg_finish_decompress(&jpegdec->cinfo);
 
-  GST_DEBUG (0,"gst_jpegdec_chain: sending buffer");
+  GST_DEBUG ("gst_jpegdec_chain: sending buffer");
   gst_pad_push(jpegdec->srcpad, outbuf);
 
   gst_buffer_unref(buf);
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index ba8dd38b..b2a8fc1d 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -18,6 +18,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 
 #include "gstjpegenc.h"
@@ -98,19 +101,19 @@ gst_jpegenc_class_init (GstJpegEnc *klass)
 static void
 gst_jpegenc_init_destination (j_compress_ptr cinfo)
 {
-  GST_DEBUG (0,"gst_jpegenc_chain: init_destination");
+  GST_DEBUG ("gst_jpegenc_chain: init_destination");
 }
 
 static gboolean
 gst_jpegenc_flush_destination (j_compress_ptr cinfo)
 {
-  GST_DEBUG (0,"gst_jpegenc_chain: flush_destination: buffer too small !!!");
+  GST_DEBUG ("gst_jpegenc_chain: flush_destination: buffer too small !!!");
   return TRUE;
 }
 
 static void gst_jpegenc_term_destination (j_compress_ptr cinfo)
 {
-  GST_DEBUG (0,"gst_jpegenc_chain: term_source");
+  GST_DEBUG ("gst_jpegenc_chain: term_source");
 }
 
 static void
@@ -134,7 +137,7 @@ gst_jpegenc_init (GstJpegEnc *jpegenc)
   jpegenc->cinfo.err = jpeg_std_error(&jpegenc->jerr);
   jpeg_create_compress(&jpegenc->cinfo);
 
-  GST_DEBUG (0,"gst_jpegenc_init: setting line buffers");
+  GST_DEBUG ("gst_jpegenc_init: setting line buffers");
   jpegenc->line[0] = NULL;
   jpegenc->line[1] = NULL;
   jpegenc->line[2] = NULL;
@@ -154,13 +157,13 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
   guint size = 0;
   gint width, height;
 
-  GST_DEBUG (0,"gst_jpegenc_resync: resync");
+  GST_DEBUG ("gst_jpegenc_resync: resync");
 
   jpegenc->cinfo.image_width = width = jpegenc->width;
   jpegenc->cinfo.image_height = height = jpegenc->height;
   jpegenc->cinfo.input_components = 3;
 
-  GST_DEBUG (0,"gst_jpegenc_resync: wdith %d, height %d", width, height);
+  GST_DEBUG ("gst_jpegenc_resync: wdith %d, height %d", width, height);
 
   jpeg_set_defaults(&jpegenc->cinfo);
   jpegenc->cinfo.dct_method = JDCT_FASTEST;
@@ -172,7 +175,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
   switch (jpegenc->format) {
     case GST_COLORSPACE_RGB24:
       size = 3;
-      GST_DEBUG (0,"gst_jpegenc_resync: setting format to RGB24");
+      GST_DEBUG ("gst_jpegenc_resync: setting format to RGB24");
       jpegenc->cinfo.in_color_space = JCS_RGB;
       jpegenc->cinfo.raw_data_in = FALSE;
       break;
@@ -180,7 +183,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
       size = 2;
       jpegenc->cinfo.raw_data_in = TRUE;
       jpegenc->cinfo.in_color_space = JCS_YCbCr;
-      GST_DEBUG (0,"gst_jpegenc_resync: setting format to YUV420P");
+      GST_DEBUG ("gst_jpegenc_resync: setting format to YUV420P");
       jpegenc->cinfo.comp_info[0].h_samp_factor = 2;
       jpegenc->cinfo.comp_info[0].v_samp_factor = 2;
       jpegenc->cinfo.comp_info[1].h_samp_factor = 1;
@@ -194,7 +197,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
         jpegenc->line[2] = g_realloc(jpegenc->line[2], height*sizeof(char*)/2);
       }
 
-      GST_DEBUG (0,"gst_jpegenc_resync: setting format done");
+      GST_DEBUG ("gst_jpegenc_resync: setting format done");
       break;
     default:
       printf("gst_jpegenc_resync: unsupported colorspace, using RGB\n");
@@ -209,7 +212,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc)
   jpeg_suppress_tables(&jpegenc->cinfo, TRUE);
 
   jpegenc->buffer = NULL;
-  GST_DEBUG (0,"gst_jpegenc_resync: resync done");
+  GST_DEBUG ("gst_jpegenc_resync: resync done");
 }
 
 static GstBuffer*
@@ -218,7 +221,7 @@ gst_jpegenc_get (GstPad *pad)
   GstJpegEnc *jpegenc;
   GstBuffer *newbuf;
 
-  GST_DEBUG (0,"gst_jpegenc_chain: pull buffer");
+  GST_DEBUG ("gst_jpegenc_chain: pull buffer");
 
   g_return_val_if_fail (pad != NULL, NULL);
   g_return_val_if_fail (GST_IS_PAD (pad), NULL);
@@ -227,7 +230,7 @@ gst_jpegenc_get (GstPad *pad)
 
   if (jpegenc->buffer == NULL || GST_BUFFER_REFCOUNT_VALUE(jpegenc->buffer) != 1) {
     if (jpegenc->buffer) gst_buffer_unref(jpegenc->buffer);
-    GST_DEBUG (0,"gst_jpegenc_chain: new buffer");
+    GST_DEBUG ("gst_jpegenc_chain: new buffer");
     newbuf = jpegenc->buffer = gst_buffer_new();
     GST_BUFFER_DATA(newbuf) = g_malloc(jpegenc->bufsize);
     GST_BUFFER_SIZE(newbuf) = jpegenc->bufsize;
@@ -260,7 +263,7 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf)
   data = GST_BUFFER_DATA(buf);
   size = GST_BUFFER_SIZE(buf);
 
-  GST_DEBUG (0,"gst_jpegenc_chain: got buffer of %ld bytes in '%s'",size,
+  GST_DEBUG ("gst_jpegenc_chain: got buffer of %ld bytes in '%s'",size,
           GST_OBJECT_NAME (jpegenc));
 
   outbuf = gst_buffer_new();
@@ -281,7 +284,7 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf)
   jpeg_start_compress(&jpegenc->cinfo, TRUE);
 
   width2 = width>>1;
-  GST_DEBUG (0,"gst_jpegdec_chain: compressing");
+  GST_DEBUG ("gst_jpegdec_chain: compressing");
 
   for (i = 0; i < height; i += 2*DCTSIZE) {
     for (j=0, k=0; j<2*DCTSIZE;j+=2, k++) {
@@ -293,7 +296,7 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf)
     jpeg_write_raw_data(&jpegenc->cinfo, jpegenc->line, 2*DCTSIZE);
   }
   jpeg_finish_compress(&jpegenc->cinfo);
-  GST_DEBUG (0,"gst_jpegdec_chain: compressing done");
+  GST_DEBUG ("gst_jpegdec_chain: compressing done");
 
   GST_BUFFER_SIZE(outbuf) = (((outsize - jpegenc->jdest.free_in_buffer)+3)&~3);