Made the GstProps a GList instead of a GSList

Original commit message from CVS:
Made the GstProps a GList instead of a GSList
Some fixes to inspect: added the mime type

diff --git a/gst/gstprops.c b/gst/gstprops.c
index cfc9681..c30d9f5 100644 (file)
--- a/gst/gstprops.c
+++ b/gst/gstprops.c
@@ -184,7 +184,7 @@ gst_props_register_count (GstPropsFactory factory, guint *counter)
        break;
       }
     }
-    props->properties = g_slist_insert_sorted (props->properties, entry, props_compare_func);
+    props->properties = g_list_insert_sorted (props->properties, entry, props_compare_func);
      
     tag = factory[i++];
   }
@@ -284,7 +284,7 @@ gst_props_new (GstPropsFactoryEntry entry, ...)
 GstProps*
 gst_props_merge (GstProps *props, GstProps *tomerge)
 {
-  GSList *merge_props;
+  GList *merge_props;
 
   g_return_val_if_fail (props != NULL, NULL);
   g_return_val_if_fail (tomerge != NULL, NULL);
@@ -295,9 +295,9 @@ gst_props_merge (GstProps *props, GstProps *tomerge)
   while (merge_props) {
     GstPropsEntry *entry = (GstPropsEntry *)merge_props->data;
 
-    props->properties = g_slist_insert_sorted (props->properties, entry, props_compare_func);
+    props->properties = g_list_insert_sorted (props->properties, entry, props_compare_func);
          
-    merge_props = g_slist_next (merge_props);
+    merge_props = g_list_next (merge_props);
   }
 
   return props;
@@ -412,8 +412,8 @@ gst_props_entry_check_compatibility (GstPropsEntry *entry1, GstPropsEntry *entry
 gboolean
 gst_props_check_compatibility (GstProps *fromprops, GstProps *toprops)
 {
-  GSList *sourcelist;
-  GSList *sinklist;
+  GList *sourcelist;
+  GList *sinklist;
   gint missing = 0;
   gint more = 0;
   gboolean compatible = TRUE;
@@ -434,22 +434,22 @@ gst_props_check_compatibility (GstProps *fromprops, GstProps *toprops)
     while (entry1->propid < entry2->propid) {
       GST_DEBUG (0,"source is more specific in \"%s\"\n", g_quark_to_string (entry1->propid));
       more++;
-      sourcelist = g_slist_next (sourcelist);
+      sourcelist = g_list_next (sourcelist);
       if (sourcelist) entry1 = (GstPropsEntry *)sourcelist->data;
       else goto end;
     }
     while (entry1->propid > entry2->propid) {
       GST_DEBUG (0,"source has missing property \"%s\"\n", g_quark_to_string (entry2->propid));
       missing++;
-      sinklist = g_slist_next (sinklist);
+      sinklist = g_list_next (sinklist);
       if (sinklist) entry2 = (GstPropsEntry *)sinklist->data;
       else goto end;
     }
 
     compatible &= gst_props_entry_check_compatibility (entry1, entry2);
 
-    sourcelist = g_slist_next (sourcelist);
-    sinklist = g_slist_next (sinklist);
+    sourcelist = g_list_next (sourcelist);
+    sinklist = g_list_next (sinklist);
   }
   if (sinklist) {
     GstPropsEntry *entry2;
@@ -512,7 +512,7 @@ gst_props_save_thyself_func (GstPropsEntry *entry, xmlNodePtr parent)
 xmlNodePtr
 gst_props_save_thyself (GstProps *props, xmlNodePtr parent)
 {
-  GSList *proplist;
+  GList *proplist;
   xmlNodePtr subtree;
 
   g_return_val_if_fail (props != NULL, NULL);
@@ -531,7 +531,7 @@ gst_props_save_thyself (GstProps *props, xmlNodePtr parent)
        gst_props_save_thyself_func (entry, parent);
     }
 
-    proplist = g_slist_next (proplist);
+    proplist = g_list_next (proplist);
   }
   
   return parent;
@@ -601,14 +601,14 @@ gst_props_load_thyself (xmlNodePtr parent)
         subfield = subfield->next;
       }
       entry->data.list_data.entries = g_list_reverse (entry->data.list_data.entries);
-      props->properties = g_slist_insert_sorted (props->properties, entry, props_compare_func);
+      props->properties = g_list_insert_sorted (props->properties, entry, props_compare_func);
     }
     else {
       GstPropsEntry *entry;
 
       entry = gst_props_load_thyself_func (field);
 
-      props->properties = g_slist_insert_sorted (props->properties, entry, props_compare_func);
+      props->properties = g_list_insert_sorted (props->properties, entry, props_compare_func);
     }
     field = field->next;
   }

diff --git a/gst/gstprops.h b/gst/gstprops.h
index bdfb20d..1f9bc3c 100644 (file)
--- a/gst/gstprops.h
+++ b/gst/gstprops.h
@@ -60,7 +60,7 @@ typedef enum {
 
 
 struct _GstProps {
-  GSList *properties;          /* real properties for this property */
+  GList *properties;           /* real properties for this property */
 };
 
 /* initialize the subsystem */

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 814fb27..fd50254 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = gstreamer-launch gstreamer-register gstreamer-inspect
 
-CFLAGS = -Wall -O2
+CFLAGS = -g -Wall -O2
 
 LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
 INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)

diff --git a/tools/gstreamer-inspect.c b/tools/gstreamer-inspect.c
index 89d2ced..785c5c5 100644 (file)
--- a/tools/gstreamer-inspect.c
+++ b/tools/gstreamer-inspect.c
@@ -46,15 +46,13 @@ void print_prop(GstPropsEntry *prop,gboolean showname,gchar *pfx) {
 }
 
 void print_props(GstProps *properties,gchar *pfx) {
-  GSList *props;
+  GList *props;
   GstPropsEntry *prop;
 
   props = properties->properties;
   while (props) {
     prop = (GstPropsEntry*)(props->data);
-    props = g_slist_next(props);
-
-    if (prop->propstype == GST_PROPS_END_ID_NUM) continue;
+    props = g_list_next(props);
 
     print_prop(prop,TRUE,pfx);
   }
@@ -98,6 +96,11 @@ int main(int argc,char *argv[]) {
   gst_init(&argc,&argv);
 
   factory = gst_elementfactory_find(argv[1]);
+  if (!factory) {
+    g_print ("no elementfactory for element '%s' exists\n", argv[1]);
+    return -1;
+  }
+         
   element = gst_elementfactory_create(factory,argv[1]);
   gstelement_class = GST_ELEMENT_CLASS (GTK_OBJECT (element)->klass);
 
@@ -135,10 +138,21 @@ int main(int argc,char *argv[]) {
         printf("    Capabilities:\n");
         caps = padtemplate->caps;
         while (caps) {
+         GstType *type;
+
           cap = (GstCaps*)(caps->data);
           caps = g_list_next(caps);
+
           printf("      '%s':\n",cap->name);
-          print_props(cap->properties,"        ");
+
+         type = gst_type_find_by_id (cap->id);
+         if (type) 
+            printf("        MIME type: '%s':\n",type->mime);
+         else
+            printf("        MIME type: 'unknown/unknown':\n");
+
+         if (cap->properties)
+            print_props(cap->properties,"        ");
         }
       }
 
@@ -218,7 +232,8 @@ int main(int argc,char *argv[]) {
           cap = (GstCaps*)(caps->data);
           caps = g_list_next(caps);
           printf("      '%s':\n",cap->name);
-          print_props(cap->properties,"        ");
+         if (cap->properties)
+            print_props(cap->properties,"        ");
         }
       }
 
@@ -251,6 +266,7 @@ int main(int argc,char *argv[]) {
     }
     printf("\n");
   }
+  if (num_args == 0) g_print ("  none");
   printf("\n");
 
   return 0;