Changed to the new props API

Original commit message from CVS:
Changed to the new props API
Other small tuff.

2 files changed, 38 insertions, 31 deletions

diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c
index 15472cd3..fcd76148 100644
--- a/ext/hermes/gstcolorspace.c
+++ b/ext/hermes/gstcolorspace.c
@@ -124,28 +124,34 @@ colorspace_get_bufferpool (GstPad *pad)
 static gboolean 
 colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *to_caps)
 {
-  gulong from_space, to_space;
+  guint32 from_space, to_space;
 
   g_return_val_if_fail (to_caps != NULL, FALSE);
   g_return_val_if_fail (from_caps != NULL, FALSE);
 
-  from_space = gst_caps_get_fourcc_int (from_caps, "format");
-  to_space = gst_caps_get_fourcc_int (to_caps, "format");
+  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 %08lx to %08lx", from_space, to_space);
+  GST_INFO (GST_CAT_NEGOTIATION, "set up converter for %08x to %08x", from_space, to_space);
 
   switch (from_space) {
     case GST_MAKE_FOURCC ('R','G','B',' '):
     {
-      gint from_bpp = gst_caps_get_int (from_caps, "bpp");
+      gint from_bpp;
+      
+      gst_caps_get_int (from_caps, "bpp", &from_bpp);
 
       switch (to_space) {
         case GST_MAKE_FOURCC ('R','G','B',' '):
 #ifdef HAVE_HERMES
         {
-	  space->source.r = gst_caps_get_int (from_caps, "red_mask");
-	  space->source.g = gst_caps_get_int (from_caps, "green_mask");
-	  space->source.b = gst_caps_get_int (from_caps, "blue_mask");
+          gint to_bpp;
+      
+          gst_caps_get_int (to_caps, "bpp", &to_bpp);
+
+	  gst_caps_get_int (from_caps, "red_mask",   &space->source.r);
+	  gst_caps_get_int (from_caps, "green_mask", &space->source.g);
+	  gst_caps_get_int (from_caps, "blue_mask",  &space->source.b);
 	  space->source.a = 0;
 	  space->srcbpp = space->source.bits = from_bpp;
 	  space->source.indexed = 0;
@@ -156,11 +162,11 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
 	  GST_INFO (GST_CAT_PLUGIN_INFO, "source blue mask  %08x", space->source.b);
 	  GST_INFO (GST_CAT_PLUGIN_INFO, "source bpp        %08x", space->srcbpp);
 
-	  space->dest.r = gst_caps_get_int (to_caps, "red_mask");
-	  space->dest.g = gst_caps_get_int (to_caps, "green_mask");
-	  space->dest.b = gst_caps_get_int (to_caps, "blue_mask");
+	  gst_caps_get_int (to_caps, "red_mask",   &space->dest.r);
+	  gst_caps_get_int (to_caps, "green_mask", &space->dest.g);
+	  gst_caps_get_int (to_caps, "blue_mask",  &space->dest.b);
 	  space->dest.a = 0;
-	  space->destbpp = space->dest.bits = gst_caps_get_int (to_caps, "bpp");
+	  space->destbpp = space->dest.bits = to_bpp;
 	  space->dest.indexed = 0;
 	  space->dest.has_colorkey = 0;
 
@@ -204,7 +210,7 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
         case GST_MAKE_FOURCC ('R','G','B',' '):
           GST_INFO (GST_CAT_NEGOTIATION, "colorspace: YUV to RGB");
 
-	  space->destbpp = gst_caps_get_int (to_caps, "bpp");
+	  gst_caps_get_int (to_caps, "bpp", &space->destbpp);
 	  space->converter = gst_colorspace_yuv2rgb_get_converter (from_caps, to_caps);
           space->type = GST_COLORSPACE_YUV_RGB;
 	  return TRUE;
@@ -264,8 +270,8 @@ gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps)
     return GST_PAD_CONNECT_DELAYED;
   }
 
-  space->width = gst_caps_get_int (caps, "width");
-  space->height = gst_caps_get_int (caps, "height");
+  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);
 
@@ -355,7 +361,8 @@ gst_colorspace_get_type (void)
 
   if (!colorspace_type) {
     static const GTypeInfo colorspace_info = {
-      sizeof(GstColorspaceClass),      NULL,
+      sizeof(GstColorspaceClass),      
+      NULL,
       NULL,
       (GClassInitFunc)gst_colorspace_class_init,
       NULL,
diff --git a/ext/hermes/yuv2rgb.c b/ext/hermes/yuv2rgb.c
index 24afe9ac..b1fb0008 100644
--- a/ext/hermes/yuv2rgb.c
+++ b/ext/hermes/yuv2rgb.c
@@ -100,7 +100,7 @@ static GstColorSpaceYUVTables * gst_colorspace_init_yuv(long depth,
 GstColorSpaceConverter* 
 gst_colorspace_yuv2rgb_get_converter (GstCaps *from, GstCaps *to) 
 {
-  gulong from_space, to_space;
+  guint32 from_space, to_space;
   GstColorSpaceConverter *new;
   gint to_bpp;
   
@@ -108,13 +108,13 @@ gst_colorspace_yuv2rgb_get_converter (GstCaps *from, GstCaps *to)
 
   new = g_malloc (sizeof (GstColorSpaceConverter));
 
-  new->width = gst_caps_get_int (from, "width");
-  new->height = gst_caps_get_int (from, "height");
+  gst_caps_get_int (from, "width", &new->width);
+  gst_caps_get_int (from, "height", &new->height);
   new->color_tables = NULL;
 
-  from_space = gst_caps_get_fourcc_int (from, "format");
-  to_space = gst_caps_get_fourcc_int (to, "format");
-  to_bpp = gst_caps_get_int (to, "bpp");
+  gst_caps_get_fourcc_int (from, "format", &from_space);
+  gst_caps_get_fourcc_int (to, "format", &to_space);
+  gst_caps_get_int (to, "bpp", &to_bpp);
 
   /* FIXME we leak new here. */
   g_return_val_if_fail (to_space == GST_STR_FOURCC ("RGB "), NULL);
@@ -122,17 +122,17 @@ gst_colorspace_yuv2rgb_get_converter (GstCaps *from, GstCaps *to)
   switch(from_space) {
     case GST_MAKE_FOURCC ('I','4','2','0'):
     {
-      gulong red_mask;
-      gulong green_mask;
-      gulong blue_mask;
+      gint red_mask;
+      gint green_mask;
+      gint blue_mask;
 
-      red_mask   = gst_caps_get_int (to, "red_mask");
-      green_mask = gst_caps_get_int (to, "green_mask");
-      blue_mask  = gst_caps_get_int (to, "blue_mask");
+      gst_caps_get_int (to, "red_mask",   &red_mask);
+      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    %08lx", red_mask);
-      GST_INFO (GST_CAT_PLUGIN_INFO, "green_mask  %08lx", green_mask);
-      GST_INFO (GST_CAT_PLUGIN_INFO, "blue_mask   %08lx", 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);
 
       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);