diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-07 13:18:08 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-07 13:18:08 +0000 |
| commit | 1b63854c1fc093234b7432f03c9f415936e4d21c (patch) | |
| tree | ab4b97641300961fca2c237fcd5743610b273171 /sys | |
| parent | 11207007164b355e5d9a69e09a579d36ebf296d1 (diff) | |
| download | gst-plugins-bad-1b63854c1fc093234b7432f03c9f415936e4d21c.tar.gz gst-plugins-bad-1b63854c1fc093234b7432f03c9f415936e4d21c.tar.bz2 gst-plugins-bad-1b63854c1fc093234b7432f03c9f415936e4d21c.zip | |
Fix for instantiate-test (see core). Also remove dead code from jpegenc (which still needs fixing, but that's lower o...
Original commit message from CVS:
2004-01-07 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/audiofile/gstafsink.c: (gst_afsink_init), (gst_afsink_chain),
(gst_afsink_handle_event):
* ext/jpeg/gstjpegenc.c: (gst_jpegenc_init):
* gst/avi/gstavimux.c: (gst_avimux_request_new_pad):
* sys/dxr3/dxr3audiosink.c: (dxr3audiosink_init):
* sys/dxr3/dxr3spusink.c: (dxr3spusink_init):
* sys/dxr3/dxr3videosink.c: (dxr3videosink_init):
Fix for instantiate-test (see core). Also remove dead code from
jpegenc (which still needs fixing, but that's lower on my TODO
list...).
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_getcaps):
Never return NULL as caps.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dxr3/dxr3audiosink.c | 13 | ||||
| -rw-r--r-- | sys/dxr3/dxr3spusink.c | 9 | ||||
| -rw-r--r-- | sys/dxr3/dxr3videosink.c | 9 | ||||
| -rw-r--r-- | sys/v4l2/gstv4l2src.c | 2 |
4 files changed, 1 insertions, 32 deletions
diff --git a/sys/dxr3/dxr3audiosink.c b/sys/dxr3/dxr3audiosink.c index bff47594..58709e80 100644 --- a/sys/dxr3/dxr3audiosink.c +++ b/sys/dxr3/dxr3audiosink.c @@ -93,13 +93,6 @@ GST_STATIC_PAD_TEMPLATE ( ); -GST_PAD_EVENT_MASK_FUNCTION(dxr3audiosink_get_event_mask, - { GST_EVENT_FLUSH, 0 }, - { GST_EVENT_DISCONTINUOUS, 0 }, - { GST_EVENT_EOS, 0 } -) - - static void dxr3audiosink_class_init (Dxr3AudioSinkClass *klass); static void dxr3audiosink_base_init (Dxr3AudioSinkClass *klass); static void dxr3audiosink_init (Dxr3AudioSink *sink); @@ -235,12 +228,6 @@ dxr3audiosink_init (Dxr3AudioSink *sink) gst_element_add_pad (GST_ELEMENT (sink), sink->ac3_sinkpad); GST_FLAG_SET (GST_ELEMENT(sink), GST_ELEMENT_EVENT_AWARE); - gst_pad_set_event_function (sink->pcm_sinkpad, dxr3audiosink_handle_event); - gst_pad_set_event_mask_function (sink->pcm_sinkpad, - dxr3audiosink_get_event_mask); - gst_pad_set_event_function (sink->ac3_sinkpad, dxr3audiosink_handle_event); - gst_pad_set_event_mask_function (sink->ac3_sinkpad, - dxr3audiosink_get_event_mask); sink->card_number = 0; diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c index 00969c42..0b1ba010 100644 --- a/sys/dxr3/dxr3spusink.c +++ b/sys/dxr3/dxr3spusink.c @@ -70,13 +70,6 @@ GST_STATIC_PAD_TEMPLATE ( ); -GST_PAD_EVENT_MASK_FUNCTION (dxr3spusink_get_event_mask, - { GST_EVENT_FLUSH, 0 }, - { GST_EVENT_DISCONTINUOUS, 0 }, - { GST_EVENT_EOS, 0 } -) - - static void dxr3spusink_class_init (Dxr3SpuSinkClass *klass); static void dxr3spusink_base_init (Dxr3SpuSinkClass *klass); static void dxr3spusink_init (Dxr3SpuSink *dxr3spusink); @@ -228,8 +221,6 @@ dxr3spusink_init (Dxr3SpuSink *sink) gst_pad_set_chain_function (pad, dxr3spusink_chain); GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE); - gst_pad_set_event_function (pad, dxr3spusink_handle_event); - gst_pad_set_event_mask_function (pad, dxr3spusink_get_event_mask); sink->card_number = 0; diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c index 596a3831..9c4605e5 100644 --- a/sys/dxr3/dxr3videosink.c +++ b/sys/dxr3/dxr3videosink.c @@ -93,13 +93,6 @@ GST_STATIC_PAD_TEMPLATE ( ); -GST_PAD_EVENT_MASK_FUNCTION (dxr3videosink_get_event_mask, - { GST_EVENT_FLUSH, 0 }, - { GST_EVENT_DISCONTINUOUS, 0 }, - { GST_EVENT_EOS, 0 } -) - - static void dxr3videosink_class_init (Dxr3VideoSinkClass *klass); static void dxr3videosink_base_init (Dxr3VideoSinkClass *klass); static void dxr3videosink_init (Dxr3VideoSink *dxr3videosink); @@ -219,8 +212,6 @@ dxr3videosink_init (Dxr3VideoSink *sink) gst_pad_set_chain_function (pad, dxr3videosink_chain); GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE); - gst_pad_set_event_function (pad, dxr3videosink_handle_event); - gst_pad_set_event_mask_function (pad, dxr3videosink_get_event_mask); sink->card_number = 0; diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index b6e86b0a..0c275b2c 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -743,7 +743,7 @@ gst_v4l2src_getcaps (GstPad *pad) int min_w, max_w, min_h, max_h; if (!GST_V4L2_IS_OPEN(GST_V4L2ELEMENT(v4l2src))) { - return NULL; + return gst_caps_new_any (); } /* build our own capslist */ |