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, 34 insertions, 31 deletions

diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c
index aeb66450..7e99a749 100644
--- a/ext/hermes/gstcolorspace.c
+++ b/ext/hermes/gstcolorspace.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 
 #include "gstcolorspace.h"
@@ -134,7 +137,7 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
   gst_caps_get_fourcc_int (from_caps, "format", &from_space);
   gst_caps_get_fourcc_int (to_caps,   "format", &to_space);
 
-  GST_INFO (GST_CAT_NEGOTIATION, "set up converter for %08x to %08x", from_space, to_space);
+  GST_INFO ( "set up converter for %08x to %08x", from_space, to_space);
 
   switch (from_space) {
     case GST_MAKE_FOURCC ('R','G','B',' '):
@@ -159,10 +162,10 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
 	  space->source.indexed = 0;
 	  space->source.has_colorkey = 0;
 
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "source red mask   %08x", space->source.r);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "source green mask %08x", space->source.g);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "source blue mask  %08x", space->source.b);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "source bpp        %08x", space->srcbpp);
+	  GST_INFO ( "source red mask   %08x", space->source.r);
+	  GST_INFO ( "source green mask %08x", space->source.g);
+	  GST_INFO ( "source blue mask  %08x", space->source.b);
+	  GST_INFO ( "source bpp        %08x", space->srcbpp);
 
 	  gst_caps_get_int (to_caps, "red_mask",   &space->dest.r);
 	  gst_caps_get_int (to_caps, "green_mask", &space->dest.g);
@@ -172,16 +175,16 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
 	  space->dest.indexed = 0;
 	  space->dest.has_colorkey = 0;
 
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "dest red mask   %08x", space->dest.r);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "dest green mask %08x", space->dest.g);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "dest blue mask  %08x", space->dest.b);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "dest bpp        %08x", space->destbpp);
+	  GST_INFO ( "dest red mask   %08x", space->dest.r);
+	  GST_INFO ( "dest green mask %08x", space->dest.g);
+	  GST_INFO ( "dest blue mask  %08x", space->dest.b);
+	  GST_INFO ( "dest bpp        %08x", space->destbpp);
 
 	  if (!Hermes_ConverterRequest (space->h_handle, &space->source, &space->dest)) {
 	    g_warning ("Hermes: could not get converter\n");
 	    return FALSE;
 	  }
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "converter set up");
+	  GST_INFO ( "converter set up");
           space->type = GST_COLORSPACE_HERMES;
 	  return TRUE;
 	}
@@ -202,7 +205,7 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
 	    return TRUE;
 	  }
         case GST_MAKE_FOURCC ('Y','U','Y','2'):
-          GST_INFO (GST_CAT_NEGOTIATION, "colorspace: RGB to YUV with bpp %d not implemented!!", from_bpp);
+          GST_INFO ( "colorspace: RGB to YUV with bpp %d not implemented!!", from_bpp);
 	  return FALSE;
       }
       break;
@@ -210,7 +213,7 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
     case GST_MAKE_FOURCC ('I','4','2','0'):
       switch (to_space) {
         case GST_MAKE_FOURCC ('R','G','B',' '):
-          GST_INFO (GST_CAT_NEGOTIATION, "colorspace: YUV to RGB");
+          GST_INFO ( "colorspace: YUV to RGB");
 
 	  gst_caps_get_int (to_caps, "bpp", &space->destbpp);
 	  space->converter = gst_colorspace_yuv2rgb_get_converter (from_caps, to_caps);
@@ -238,14 +241,14 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
 	  space->destbpp = 16;
 	  return TRUE;
         case GST_MAKE_FOURCC ('R','G','B',' '):
-          GST_INFO (GST_CAT_NEGOTIATION, "colorspace: YUY2 to RGB not implemented!!");
+          GST_INFO ( "colorspace: YUY2 to RGB not implemented!!");
 	  return FALSE;
       }
       break;
     case GST_MAKE_FOURCC ('Y','V','1','2'):
       switch (to_space) {
         case GST_MAKE_FOURCC ('R','G','B',' '):
-          GST_INFO (GST_CAT_NEGOTIATION, "colorspace: YV12 to RGB");
+          GST_INFO ( "colorspace: YV12 to RGB");
 
 	  gst_caps_get_int (to_caps, "bpp", &space->destbpp);
 	  space->converter = gst_colorspace_yuv2rgb_get_converter (from_caps, to_caps);
@@ -306,7 +309,7 @@ gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps)
   gst_caps_get_int (caps, "width", &space->width);
   gst_caps_get_int (caps, "height", &space->height);
 
-  GST_INFO (GST_CAT_PROPERTIES, "size: %dx%d", space->width, space->height);
+  GST_INFO ( "size: %dx%d", space->width, space->height);
 
   gst_caps_replace_sink (&space->sinkcaps, caps);
 
diff --git a/ext/hermes/yuv2rgb.c b/ext/hermes/yuv2rgb.c
index 4e98642c..62121ff5 100644
--- a/ext/hermes/yuv2rgb.c
+++ b/ext/hermes/yuv2rgb.c
@@ -111,7 +111,7 @@ gst_colorspace_yuv2rgb_get_converter (GstCaps *from, GstCaps *to)
   GstColorSpaceConverter *new;
   gint to_bpp;
   
-  GST_DEBUG (0,"gst_colorspace_yuv2rgb_get_converter");
+  GST_DEBUG ("gst_colorspace_yuv2rgb_get_converter");
 
   new = g_malloc (sizeof (GstColorSpaceConverter));
 
@@ -138,9 +138,9 @@ gst_colorspace_yuv2rgb_get_converter (GstCaps *from, GstCaps *to)
       gst_caps_get_int (to, "green_mask", &green_mask);
       gst_caps_get_int (to, "blue_mask",  &blue_mask);
 
-      GST_INFO (GST_CAT_PLUGIN_INFO, "red_mask    %08x", red_mask);
-      GST_INFO (GST_CAT_PLUGIN_INFO, "green_mask  %08x", green_mask);
-      GST_INFO (GST_CAT_PLUGIN_INFO, "blue_mask   %08x", blue_mask);
+      GST_INFO ( "red_mask    %08x", red_mask);
+      GST_INFO ( "green_mask  %08x", green_mask);
+      GST_INFO ( "blue_mask   %08x", blue_mask);
 
       new->insize 	   = new->width * new->height + new->width * new->height/2;
       new->color_tables    = gst_colorspace_init_yuv (to_bpp, red_mask, green_mask, blue_mask);
@@ -211,7 +211,7 @@ gst_colorspace_converter_destroy (GstColorSpaceConverter *conv)
 static void gst_colorspace_I420_to_rgb32(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) 
 {
   int size;
-  GST_DEBUG (0,"gst_colorspace_I420_to_rgb32");
+  GST_DEBUG ("gst_colorspace_I420_to_rgb32");
 
   size = space->width * space->height;
 
@@ -227,7 +227,7 @@ static void gst_colorspace_I420_to_rgb32(GstColorSpaceConverter *space, unsigned
 
 static void gst_colorspace_I420_to_rgb24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_I420_to_rgb24");
+  GST_DEBUG ("gst_colorspace_I420_to_rgb24");
 
   size = space->width * space->height;
 
@@ -243,7 +243,7 @@ static void gst_colorspace_I420_to_rgb24(GstColorSpaceConverter *space, unsigned
 
 static void gst_colorspace_I420_to_rgb16(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_I420_to_rgb16");
+  GST_DEBUG ("gst_colorspace_I420_to_rgb16");
 
   size = space->width * space->height;
 
@@ -260,7 +260,7 @@ static void gst_colorspace_I420_to_rgb16(GstColorSpaceConverter *space, unsigned
 #ifdef HAVE_LIBMMX
 static void gst_colorspace_I420_to_bgr32_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_I420_to_rgb32_mmx");
+  GST_DEBUG ("gst_colorspace_I420_to_rgb32_mmx");
 
   size = space->width * space->height;
 
@@ -275,7 +275,7 @@ static void gst_colorspace_I420_to_bgr32_mmx(GstColorSpaceConverter *space, unsi
 }
 static void gst_colorspace_I420_to_bgr16_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_I420_to_bgr16_mmx ");
+  GST_DEBUG ("gst_colorspace_I420_to_bgr16_mmx ");
 
   size = space->width * space->height;
 
@@ -286,7 +286,7 @@ static void gst_colorspace_I420_to_bgr16_mmx(GstColorSpaceConverter *space, unsi
                         dest,
 			space->height,
 			space->width);
-  GST_DEBUG (0,"gst_colorspace_I420_to_bgr16_mmx done");
+  GST_DEBUG ("gst_colorspace_I420_to_bgr16_mmx done");
 
 }
 #endif
@@ -295,7 +295,7 @@ static void gst_colorspace_I420_to_bgr16_mmx(GstColorSpaceConverter *space, unsi
 static void gst_colorspace_YV12_to_rgb32(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) 
 {
   int size;
-  GST_DEBUG (0,"gst_colorspace_YV12_to_rgb32");
+  GST_DEBUG ("gst_colorspace_YV12_to_rgb32");
 
   size = space->width * space->height;
 
@@ -311,7 +311,7 @@ static void gst_colorspace_YV12_to_rgb32(GstColorSpaceConverter *space, unsigned
 
 static void gst_colorspace_YV12_to_rgb24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_YV12_to_rgb24");
+  GST_DEBUG ("gst_colorspace_YV12_to_rgb24");
 
   size = space->width * space->height;
 
@@ -327,7 +327,7 @@ static void gst_colorspace_YV12_to_rgb24(GstColorSpaceConverter *space, unsigned
 
 static void gst_colorspace_YV12_to_rgb16(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_YV12_to_rgb16");
+  GST_DEBUG ("gst_colorspace_YV12_to_rgb16");
 
   size = space->width * space->height;
 
@@ -344,7 +344,7 @@ static void gst_colorspace_YV12_to_rgb16(GstColorSpaceConverter *space, unsigned
 #ifdef HAVE_LIBMMX
 static void gst_colorspace_YV12_to_bgr32_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_YV12_to_rgb32_mmx");
+  GST_DEBUG ("gst_colorspace_YV12_to_rgb32_mmx");
 
   size = space->width * space->height;
 
@@ -359,7 +359,7 @@ static void gst_colorspace_YV12_to_bgr32_mmx(GstColorSpaceConverter *space, unsi
 }
 static void gst_colorspace_YV12_to_bgr16_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_YV12_to_bgr16_mmx ");
+  GST_DEBUG ("gst_colorspace_YV12_to_bgr16_mmx ");
 
   size = space->width * space->height;
 
@@ -370,7 +370,7 @@ static void gst_colorspace_YV12_to_bgr16_mmx(GstColorSpaceConverter *space, unsi
                         dest,
 			space->height,
 			space->width);
-  GST_DEBUG (0,"gst_colorspace_YV12_to_bgr16_mmx done");
+  GST_DEBUG ("gst_colorspace_YV12_to_bgr16_mmx done");
 
 }
 #endif