Redo patch using _NUM rather than converting one way and then back again, as wtay...

Original commit message from CVS:
Redo patch using _NUM rather than converting one way and then back again,
as wtay suggested.  Ho hum.

diff --git a/gst/gstprops.c b/gst/gstprops.c
index 39213d4..a3e688b 100644 (file)
--- a/gst/gstprops.c
+++ b/gst/gstprops.c
@@ -54,23 +54,23 @@ gst_props_create_entry (GstPropsFactory factory, gint *skipped)
 
   tag = factory[i++];
   switch (GPOINTER_TO_INT (tag)) {
-    case GPOINTER_TO_INT(GST_PROPS_INT_ID):
+    case GST_PROPS_INT_ID_NUM:
       entry->propstype = GST_PROPS_INT_ID_NUM;
       entry->data.int_data = GPOINTER_TO_INT (factory[i++]);
       break;
-    case GPOINTER_TO_INT(GST_PROPS_INT_RANGE_ID):
+    case GST_PROPS_INT_RANGE_ID_NUM:
       entry->propstype = GST_PROPS_INT_RANGE_ID_NUM;
       entry->data.int_range_data.min = GPOINTER_TO_INT (factory[i++]);
       entry->data.int_range_data.max = GPOINTER_TO_INT (factory[i++]);
       break;
-    case GPOINTER_TO_INT(GST_PROPS_FOURCC_ID):
+    case GST_PROPS_FOURCC_ID_NUM:
       entry->propstype = GST_PROPS_FOURCC_ID_NUM;
       entry->data.fourcc_data = GPOINTER_TO_INT (factory[i++]);
       break;
-    case GPOINTER_TO_INT(GST_PROPS_LIST_ID):
+    case GST_PROPS_LIST_ID_NUM:
       g_print("gstprops: list not allowed in list\n");
       break;
-    case GPOINTER_TO_INT(GST_PROPS_BOOL_ID):
+    case GST_PROPS_BOOL_ID_NUM:
       entry->propstype = GST_PROPS_BOOL_ID_NUM;
       entry->data.bool_data = GPOINTER_TO_INT (factory[i++]);
       break;
@@ -154,7 +154,7 @@ gst_props_register_count (GstPropsFactory factory, guint *counter)
 
     tag = factory[i];
     switch (GPOINTER_TO_INT (tag)) {
-      case GPOINTER_TO_INT(GST_PROPS_LIST_ID): 
+      case GST_PROPS_LIST_ID_NUM: 
       {
         GstPropsEntry *list_entry;
 
@@ -241,13 +241,13 @@ gst_props_new (GstPropsFactoryEntry entry, ...)
       value = va_arg (var_args, GstPropsFactoryEntry);
     }
     switch (GPOINTER_TO_INT (value)) {
-      case GPOINTER_TO_INT(GST_PROPS_END_ID): 
+      case GST_PROPS_END_ID_NUM: 
        g_assert (inlist == TRUE);
 
        inlist = FALSE;
        skip = 0;
        break;
-      case GPOINTER_TO_INT(GST_PROPS_LIST_ID): 
+      case GST_PROPS_LIST_ID_NUM: 
       {
        g_assert (inlist == FALSE);