summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gst/switch/gstswitch.c20
-rw-r--r--gst/switch/gstswitch.h6
3 files changed, 30 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7de180e5..7d485efe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-12-17 Andy Wingo <wingo@pobox.com>
+ * gst/switch/gstswitch.h (struct _GstStreamSelectorClass): Fix
+ vmethod prototypes.
+
+ * gst/switch/gstswitch.c (gst_stream_selector_class_init)
+ (gst_stream_selector_block, gst_stream_selector_switch): Add empty
+ vmethod definitions. Patch 3/12.
+
* gst/switch/gstswitch.h (struct _GstStreamSelectorClass):
* gst/switch/gstswitch.c (gst_stream_selector_class_init): Add
`block' and `switch' signals.
diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c
index c1f4b53b..269ac91e 100644
--- a/gst/switch/gstswitch.c
+++ b/gst/switch/gstswitch.c
@@ -381,6 +381,10 @@ static void gst_stream_selector_release_pad (GstElement * element,
GstPad * pad);
static GList *gst_stream_selector_get_linked_pads (GstPad * pad);
static GstCaps *gst_stream_selector_getcaps (GstPad * pad);
+static void gst_stream_selector_block (GstStreamSelector * self);
+static void gst_stream_selector_switch (GstStreamSelector * self,
+ const gchar * pad_name, GstClockTime stop_time, GstClockTime start_time);
+
static GstElementClass *parent_class = NULL;
GType
@@ -467,6 +471,9 @@ gst_stream_selector_class_init (GstStreamSelectorClass * klass)
G_STRUCT_OFFSET (GstStreamSelectorClass, switch_),
NULL, NULL, gst_switch_marshal_VOID__STRING_UINT64_UINT64,
G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_UINT64);
+
+ klass->block = GST_DEBUG_FUNCPTR (gst_stream_selector_block);
+ klass->switch_ = GST_DEBUG_FUNCPTR (gst_stream_selector_switch);
}
static void
@@ -714,6 +721,19 @@ gst_stream_selector_release_pad (GstElement * element, GstPad * pad)
gst_element_remove_pad (GST_ELEMENT (sel), pad);
}
+static void
+gst_stream_selector_block (GstStreamSelector * self)
+{
+ return;
+}
+
+static void
+gst_stream_selector_switch (GstStreamSelector * self, const gchar * pad_name,
+ GstClockTime stop_time, GstClockTime start_time)
+{
+ return;
+}
+
static gboolean
plugin_init (GstPlugin * plugin)
{
diff --git a/gst/switch/gstswitch.h b/gst/switch/gstswitch.h
index 3d88ca2b..4690c3c3 100644
--- a/gst/switch/gstswitch.h
+++ b/gst/switch/gstswitch.h
@@ -53,9 +53,9 @@ struct _GstStreamSelector {
struct _GstStreamSelectorClass {
GstElementClass parent_class;
- void (*block) (void);
- void (*switch_) (const gchar *pad_name, GstClockTime stop_time,
- GstClockTime start_time);
+ void (*block) (GstStreamSelector *self);
+ void (*switch_) (GstStreamSelector *self, const gchar *pad_name,
+ GstClockTime stop_time, GstClockTime start_time);
};
GType gst_stream_selector_get_type (void);