From: Tim-Philipp Müller Date: Thu, 24 Nov 2011 01:18:38 +0000 (+0000) Subject: playbin2, uridecodebin: make connection-speed property a guint64 X-Git-Tag: 1.19.3~511^2~7108 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16f6d139805a68388e4e4c101bd021d21768b51e;p=platform%2Fupstream%2Fgstreamer.git playbin2, uridecodebin: make connection-speed property a guint64 --- diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index 6fc3bd3..6d0ed79 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -372,7 +372,7 @@ struct _GstPlayBin GstSourceGroup *next_group; /* pointer to the next group */ /* properties */ - guint connection_speed; /* connection speed in bits/sec (0 = unknown) */ + guint64 connection_speed; /* connection speed in bits/sec (0 = unknown) */ gint current_video; /* the currently selected stream */ gint current_audio; /* the currently selected stream */ gint current_text; /* the currently selected stream */ @@ -774,9 +774,9 @@ gst_play_bin_class_init (GstPlayBinClass * klass) G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_klass, PROP_CONNECTION_SPEED, - g_param_spec_uint ("connection-speed", "Connection Speed", + g_param_spec_uint64 ("connection-speed", "Connection Speed", "Network connection speed in kbps (0 = unknown)", - 0, G_MAXUINT / 1000, DEFAULT_CONNECTION_SPEED, + 0, G_MAXUINT64 / 1000, DEFAULT_CONNECTION_SPEED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_klass, PROP_BUFFER_SIZE, @@ -1911,7 +1911,7 @@ gst_play_bin_set_property (GObject * object, guint prop_id, break; case PROP_CONNECTION_SPEED: GST_PLAY_BIN_LOCK (playbin); - playbin->connection_speed = g_value_get_uint (value) * 1000; + playbin->connection_speed = g_value_get_uint64 (value) * 1000; GST_PLAY_BIN_UNLOCK (playbin); break; case PROP_BUFFER_SIZE: @@ -2082,7 +2082,7 @@ gst_play_bin_get_property (GObject * object, guint prop_id, GValue * value, break; case PROP_CONNECTION_SPEED: GST_PLAY_BIN_LOCK (playbin); - g_value_set_uint (value, playbin->connection_speed / 1000); + g_value_set_uint64 (value, playbin->connection_speed / 1000); GST_PLAY_BIN_UNLOCK (playbin); break; case PROP_BUFFER_SIZE: diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c index 95d2bfc..058870a 100644 --- a/gst/playback/gsturidecodebin.c +++ b/gst/playback/gsturidecodebin.c @@ -80,7 +80,7 @@ struct _GstURIDecodeBin GList *factories; /* factories we can use for selecting elements */ gchar *uri; - guint connection_speed; + guint64 connection_speed; GstCaps *caps; gchar *encoding; @@ -366,9 +366,9 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) GST_TYPE_ELEMENT, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_CONNECTION_SPEED, - g_param_spec_uint ("connection-speed", "Connection Speed", + g_param_spec_uint64 ("connection-speed", "Connection Speed", "Network connection speed in kbps (0 = unknown)", - 0, G_MAXUINT / 1000, DEFAULT_CONNECTION_SPEED, + 0, G_MAXUINT64 / 1000, DEFAULT_CONNECTION_SPEED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_CAPS, @@ -732,7 +732,7 @@ gst_uri_decode_bin_set_property (GObject * object, guint prop_id, break; case PROP_CONNECTION_SPEED: GST_OBJECT_LOCK (dec); - dec->connection_speed = g_value_get_uint (value) * 1000; + dec->connection_speed = g_value_get_uint64 (value) * 1000; GST_OBJECT_UNLOCK (dec); break; case PROP_CAPS: @@ -788,7 +788,7 @@ gst_uri_decode_bin_get_property (GObject * object, guint prop_id, break; case PROP_CONNECTION_SPEED: GST_OBJECT_LOCK (dec); - g_value_set_uint (value, dec->connection_speed / 1000); + g_value_set_uint64 (value, dec->connection_speed / 1000); GST_OBJECT_UNLOCK (dec); break; case PROP_CAPS: