diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-15 18:26:00 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-15 18:26:00 +0100 |
| commit | 278e14e99e541f6ef88b1d162cf9639119be02df (patch) | |
| tree | bf95f8baad91763760526c2b6dbb5e4353d1ca15 | |
| parent | e85d07ecce16b2f6ab49089cc2b1d9521db01cb5 (diff) | |
message: add timeout to progress messageprogress
Add a timeout member to the progress messages to let the application know about
the timeout so that it can do some gui things with it.
| -rw-r--r-- | gst/gstmessage.c | 5 | ||||
| -rw-r--r-- | gst/gstquark.c | 2 | ||||
| -rw-r--r-- | gst/gstquark.h | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/gst/gstmessage.c b/gst/gstmessage.c index 5d06c67d4..e15104230 100644 --- a/gst/gstmessage.c +++ b/gst/gstmessage.c @@ -2104,7 +2104,7 @@ gst_message_new_progress (GstObject * src, GstProgressType type, { GstMessage *message; GstStructure *structure; - gint percent = 100; + gint percent = 100, timeout = -1; g_return_val_if_fail (code != NULL, NULL); g_return_val_if_fail (text != NULL, NULL); @@ -2116,7 +2116,8 @@ gst_message_new_progress (GstObject * src, GstProgressType type, GST_QUARK (TYPE), GST_TYPE_PROGRESS_TYPE, type, GST_QUARK (CODE), G_TYPE_STRING, code, GST_QUARK (TEXT), G_TYPE_STRING, text, - GST_QUARK (PERCENT), G_TYPE_INT, percent, NULL); + GST_QUARK (PERCENT), G_TYPE_INT, percent, + GST_QUARK (TIMEOUT), G_TYPE_INT, timeout, NULL); message = gst_message_new_custom (GST_MESSAGE_PROGRESS, src, structure); return message; diff --git a/gst/gstquark.c b/gst/gstquark.c index e43ce0d2d..91a201271 100644 --- a/gst/gstquark.c +++ b/gst/gstquark.c @@ -50,7 +50,7 @@ static const gchar *_quark_strings[] = { "intermediate", "GstMessageStepStart", "active", "eos", "sink-message", "message", "GstMessageQOS", "running-time", "stream-time", "jitter", "quality", "processed", "dropped", "buffering-ranges", "GstMessageProgress", - "code", "text", "percent" + "code", "text", "percent", "timeout" }; GQuark _priv_gst_quark_table[GST_QUARK_MAX]; diff --git a/gst/gstquark.h b/gst/gstquark.h index aa0a7efa5..6e16ee5d7 100644 --- a/gst/gstquark.h +++ b/gst/gstquark.h @@ -131,8 +131,9 @@ typedef enum _GstQuarkId GST_QUARK_CODE = 102, GST_QUARK_TEXT = 103, GST_QUARK_PERCENT = 104, + GST_QUARK_TIMEOUT = 105, - GST_QUARK_MAX = 105 + GST_QUARK_MAX = 106 } GstQuarkId; extern GQuark _priv_gst_quark_table[GST_QUARK_MAX]; |