[gst-cvs] gst-plugins-base: playbin2/uridecodebin: Fix connection-speed propagation

[<th...@ke...>]

Module: gst-plugins-base
Branch: master
Commit: 79e97ec5ec0a2a798cfbf259cf05730dbeeb0acf
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=79e97ec5ec0a2a798cfbf259cf05730dbeeb0acf

Author: Jan Schmidt <th...@no...>
Date:   Wed Jun 10 16:56:51 2009 +0100

playbin2/uridecodebin: Fix connection-speed propagation

uridecodebin expects the passed connection-speed value in kbps, so we
need to divide the value stored in bps by 1000. Also, lower the upper
limit on the properties to the value that we can actually store in our
internal guint (which is plenty high enough)

---

 gst/playback/gstplaybin2.c     |    6 +++---
 gst/playback/gsturidecodebin.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index ef739ed..ff6e446 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -757,7 +757,7 @@ gst_play_bin_class_init (GstPlayBinClass * klass)
   g_object_class_install_property (gobject_klass, PROP_CONNECTION_SPEED,
       g_param_spec_uint ("connection-speed", "Connection Speed",
           "Network connection speed in kbps (0 = unknown)",
-          0, G_MAXUINT, DEFAULT_CONNECTION_SPEED,
+          0, G_MAXUINT / 1000, DEFAULT_CONNECTION_SPEED,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_klass, PROP_BUFFER_SIZE,
@@ -2519,8 +2519,8 @@ activate_group (GstPlayBin * playbin, GstSourceGroup * group)
   }
 
   /* configure connection speed */
-  g_object_set (uridecodebin, "connection-speed", playbin->connection_speed,
-      NULL);
+  g_object_set (uridecodebin, "connection-speed",
+      playbin->connection_speed / 1000, NULL);
   /* configure subtitle encoding */
   g_object_set (uridecodebin, "subtitle-encoding", playbin->encoding, NULL);
   /* configure uri */
diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c
index 146aa94..1ded6ea 100644
--- a/gst/playback/gsturidecodebin.c
+++ b/gst/playback/gsturidecodebin.c
@@ -281,7 +281,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass)
   g_object_class_install_property (gobject_class, PROP_CONNECTION_SPEED,
       g_param_spec_uint ("connection-speed", "Connection Speed",
           "Network connection speed in kbps (0 = unknown)",
-          0, G_MAXUINT, DEFAULT_CONNECTION_SPEED,
+          0, G_MAXUINT / 1000, DEFAULT_CONNECTION_SPEED,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class, PROP_CAPS,