From bed8c238f084086e4a73ce5325647343d376bfc9 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sat, 8 Oct 2005 16:13:50 +0000 Subject: [PATCH] gst/gstevent.*: Fix event quark registration. Original commit message from CVS: * gst/gstevent.c: * gst/gstevent.h: Fix event quark registration. Add some space between events so we can insert them in the right groups. --- ChangeLog | 8 ++++++++ gst/gstevent.c | 7 +++++++ gst/gstevent.h | 17 +++++++++-------- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 400bdfcc0e..3c50be0e4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-10-08 Wim Taymans + + * gst/gstevent.c: + * gst/gstevent.h: + Fix event quark registration. + Add some space between events so we can insert them in the + right groups. + 2005-10-08 Wim Taymans * gst/base/gstbasesink.c: (gst_base_sink_handle_object), diff --git a/gst/gstevent.c b/gst/gstevent.c index 60d56cf786..8d8e0a096b 100644 --- a/gst/gstevent.c +++ b/gst/gstevent.c @@ -72,9 +72,16 @@ static GstEventQuarks event_quarks[] = { {GST_EVENT_NEWSEGMENT, "newsegment", 0}, {GST_EVENT_TAG, "tag", 0}, {GST_EVENT_FILLER, "filler", 0}, + {GST_EVENT_BUFFERSIZE, "buffersize", 0}, {GST_EVENT_QOS, "qos", 0}, {GST_EVENT_SEEK, "seek", 0}, {GST_EVENT_NAVIGATION, "navigation", 0}, + {GST_EVENT_CUSTOM_UP, "custom-up", 0}, + {GST_EVENT_CUSTOM_DS, "custom-ds", 0}, + {GST_EVENT_CUSTOM_DS_OOB, "custom-ds-oob", 0}, + {GST_EVENT_CUSTOM_BOTH, "custom-both", 0}, + {GST_EVENT_CUSTOM_BOTH_OOB, "custom-both-oob", 0}, + {0, NULL, 0} }; diff --git a/gst/gstevent.h b/gst/gstevent.h index 8581bb2521..969293ade2 100644 --- a/gst/gstevent.h +++ b/gst/gstevent.h @@ -79,21 +79,22 @@ G_BEGIN_DECLS * GstStructure. * Specific custom events are distinguished by the name of the structure. */ +/* NOTE: keep in sync with quark registration in gstevent.c */ typedef enum { GST_EVENT_UNKNOWN = GST_EVENT_MAKE_TYPE (0, 0), /* bidirectional events */ GST_EVENT_FLUSH_START = GST_EVENT_MAKE_TYPE (1, GST_EVDIR_BOTH), GST_EVENT_FLUSH_STOP = GST_EVENT_MAKE_TYPE (2, GST_EVDIR_BOTH), /* downstream serialized events */ - GST_EVENT_EOS = GST_EVENT_MAKE_TYPE (3, GST_EVDIR_DS | GST_EVSER), - GST_EVENT_NEWSEGMENT = GST_EVENT_MAKE_TYPE (4, GST_EVDIR_DS | GST_EVSER), - GST_EVENT_TAG = GST_EVENT_MAKE_TYPE (5, GST_EVDIR_DS | GST_EVSER), - GST_EVENT_FILLER = GST_EVENT_MAKE_TYPE (6, GST_EVDIR_DS | GST_EVSER), - GST_EVENT_BUFFERSIZE = GST_EVENT_MAKE_TYPE (7, GST_EVDIR_DS | GST_EVSER), + GST_EVENT_EOS = GST_EVENT_MAKE_TYPE (5, GST_EVDIR_DS | GST_EVSER), + GST_EVENT_NEWSEGMENT = GST_EVENT_MAKE_TYPE (6, GST_EVDIR_DS | GST_EVSER), + GST_EVENT_TAG = GST_EVENT_MAKE_TYPE (7, GST_EVDIR_DS | GST_EVSER), + GST_EVENT_FILLER = GST_EVENT_MAKE_TYPE (8, GST_EVDIR_DS | GST_EVSER), + GST_EVENT_BUFFERSIZE = GST_EVENT_MAKE_TYPE (9, GST_EVDIR_DS | GST_EVSER), /* upstream events */ - GST_EVENT_QOS = GST_EVENT_MAKE_TYPE (8, GST_EVDIR_US), - GST_EVENT_SEEK = GST_EVENT_MAKE_TYPE (9, GST_EVDIR_US), - GST_EVENT_NAVIGATION = GST_EVENT_MAKE_TYPE (10, GST_EVDIR_US), + GST_EVENT_QOS = GST_EVENT_MAKE_TYPE (15, GST_EVDIR_US), + GST_EVENT_SEEK = GST_EVENT_MAKE_TYPE (16, GST_EVDIR_US), + GST_EVENT_NAVIGATION = GST_EVENT_MAKE_TYPE (17, GST_EVDIR_US), /* custom events start here */ GST_EVENT_CUSTOM_UP = GST_EVENT_MAKE_TYPE (32, GST_EVDIR_US),