Some leftover fixes from Michael.

Original commit message from CVS:
Some leftover fixes from Michael.

diff --git a/ChangeLog b/ChangeLog
index f83f66b..58ca323 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-14  Michael Meeks  <michael@ximian.com>
+
+        * gst/gstelement.c (gst_element_populate_std_props):
+        add debug & robustness.
+
 2001-12-13  Michael Meeks  <michael@ximian.com>
 
        * gst/elements/*.c: (..._class_init): clean to use

diff --git a/gst/gstelement.c b/gst/gstelement.c
index 2950a06..3fd2bd4 100644 (file)
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -1307,7 +1307,7 @@ gst_element_populate_std_props (GObjectClass * klass,
                                const char *prop_name, guint arg_id, GParamFlags flags)
 {
   GQuark prop_id = g_quark_from_string (prop_name);
-  GParamSpec *pspec = NULL;
+  GParamSpec *pspec;
 
   static GQuark fd_id = 0;
   static GQuark blocksize_id;
@@ -1334,8 +1334,8 @@ gst_element_populate_std_props (GObjectClass * klass,
   }
 
   if (prop_id == fd_id) {
-    g_param_spec_int ("fd", "File-descriptor",
-                     "File-descriptor for the file being read", 0, G_MAXINT, 0, flags);
+    pspec = g_param_spec_int ("fd", "File-descriptor",
+                             "File-descriptor for the file being read", 0, G_MAXINT, 0, flags);
 
   }
   else if (prop_id == blocksize_id) {
@@ -1381,6 +1381,12 @@ gst_element_populate_std_props (GObjectClass * klass,
     pspec = g_param_spec_boolean ("touch", "Touch read data",
                                  "Touch data to force disk read before push ()", TRUE, flags);
   }
+  else {
+    g_warning ("Unknown - 'standard' property '%s' id %d on class %s",
+               prop_name, arg_id,
+               g_type_name_from_class ((GTypeClass *) klass));
+    pspec = NULL;
+  }
 
   if (pspec) {
     g_object_class_install_property (klass, arg_id, pspec);

diff --git a/gstplay/ChangeLog b/gstplay/ChangeLog
index 3de970b..c6907f1 100644 (file)
--- a/gstplay/ChangeLog
+++ b/gstplay/ChangeLog
@@ -1,3 +1,24 @@
+2001-12-14  Wim Taymans  <wim.taymans@chello.be>
+
+        * (gst_play_set_uri): use filesrc again.
+
+2001-12-13  Michael Meeks  <michael@ximian.com>
+
+        * gstplay.c (gst_play_object_introspect): copy and
+        port to GObject.
+        (gst_play_get_arg): use UINT for compat.
+        (gst_play_set_uri): use disksrc instead.
+
+        * gststatusarea.c (gst_status_area_expose): needs
+        pangoizing, conditionaly build.
+
+        * gstmediaplay.c (gst_media_play_init): upd.
+        (gst_media_play_show_playlist):
+
+        * gstplay.h (gst_glade_xml_new): add.
+
+        * callbacks.c (on_preferences1_activate): glade hacks.
+
 2001-12-06  Arik Devens  <arik@gnome.org>
 
        * gstmediaplay.c (window_key_press_event): Added a case for

diff --git a/gstplay/gstplay.c b/gstplay/gstplay.c
index bfd9c18..e566be6 100644 (file)
--- a/gstplay/gstplay.c
+++ b/gstplay/gstplay.c
@@ -449,7 +449,7 @@ gst_play_set_uri (GstPlay *play, const guchar *uri)
        }
        
        if (priv->src == NULL) {
-               priv->src = gst_elementfactory_make ("disksrc", "srcelement");
+               priv->src = gst_elementfactory_make ("filesrc", "srcelement");
        }
        
        priv->uri = g_strdup (uri);