summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2003-10-08 16:08:19 +0000
committerAndy Wingo <wingo@pobox.com>2003-10-08 16:08:19 +0000
commitc07813ac2ca2a969ac4f46b7f2bcaee731f0ca79 (patch)
tree88f65b715d1fa83677b13286b3681a6096b5dcf2 /sys
parent69edaac422d50a0e365fae15d354c07c0f5419d4 (diff)
downloadgst-plugins-bad-c07813ac2ca2a969ac4f46b7f2bcaee731f0ca79.tar.gz
gst-plugins-bad-c07813ac2ca2a969ac4f46b7f2bcaee731f0ca79.tar.bz2
gst-plugins-bad-c07813ac2ca2a969ac4f46b7f2bcaee731f0ca79.zip
/GstBuffer/GstData/ in the API where you can pass events. Fix the plugins to deal with that. Fixes #113488.
Original commit message from CVS: /GstBuffer/GstData/ in the API where you can pass events. Fix the plugins to deal with that. Fixes #113488.
Diffstat (limited to 'sys')
-rw-r--r--sys/dxr3/dxr3spusink.c5
-rw-r--r--sys/dxr3/dxr3videosink.c5
-rw-r--r--sys/qcam/gstqcamsrc.c6
-rw-r--r--sys/v4l2/gstv4l2src.c6
-rw-r--r--sys/vcd/vcdsrc.c8
5 files changed, 16 insertions, 14 deletions
diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c
index e9142c3c..8d2044e3 100644
--- a/sys/dxr3/dxr3spusink.c
+++ b/sys/dxr3/dxr3spusink.c
@@ -97,7 +97,7 @@ static void dxr3spusink_set_clock (GstElement *element,
GstClock *clock);
static gboolean dxr3spusink_handle_event (GstPad *pad, GstEvent *event);
-static void dxr3spusink_chain (GstPad *pad,GstBuffer *buf);
+static void dxr3spusink_chain (GstPad *pad,GstData *_data);
static GstElementStateReturn dxr3spusink_change_state (GstElement *element);
@@ -381,8 +381,9 @@ dxr3spusink_handle_event (GstPad *pad, GstEvent *event)
static void
-dxr3spusink_chain (GstPad *pad, GstBuffer *buf)
+dxr3spusink_chain (GstPad *pad, GstData *_data)
{
+ GstBuffer *buf = GST_BUFFER (_data);
Dxr3SpuSink *sink;
gint bytes_written = 0;
diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c
index 5f8f953d..843f33bc 100644
--- a/sys/dxr3/dxr3videosink.c
+++ b/sys/dxr3/dxr3videosink.c
@@ -133,7 +133,7 @@ static void dxr3videosink_write_data (Dxr3VideoSink *sink,
static void dxr3videosink_parse_data (Dxr3VideoSink *sink);
static gboolean dxr3videosink_handle_event (GstPad *pad, GstEvent *event);
-static void dxr3videosink_chain (GstPad *pad,GstBuffer *buf);
+static void dxr3videosink_chain (GstPad *pad,GstData *_data);
static GstElementStateReturn dxr3videosink_change_state (GstElement *element);
@@ -624,8 +624,9 @@ dxr3videosink_handle_event (GstPad *pad, GstEvent *event)
static void
-dxr3videosink_chain (GstPad *pad, GstBuffer *buf)
+dxr3videosink_chain (GstPad *pad, GstData *_data)
{
+ GstBuffer *buf = GST_BUFFER (_data);
Dxr3VideoSink *sink;
GstBuffer *merged;
diff --git a/sys/qcam/gstqcamsrc.c b/sys/qcam/gstqcamsrc.c
index 2c730328..b7f1a6f9 100644
--- a/sys/qcam/gstqcamsrc.c
+++ b/sys/qcam/gstqcamsrc.c
@@ -123,7 +123,7 @@ static GstElementStateReturn gst_qcamsrc_change_state (GstElement *element);
static void gst_qcamsrc_close (GstQCamSrc *src);
static gboolean gst_qcamsrc_open (GstQCamSrc *src);
-static GstBuffer* gst_qcamsrc_get (GstPad *pad);
+static GstData* gst_qcamsrc_get (GstPad *pad);
static GstElementClass *parent_class = NULL;
/*//static guint gst_qcamsrc_signals[LAST_SIGNAL] = { 0 }; */
@@ -227,7 +227,7 @@ gst_qcamsrc_init (GstQCamSrc *qcamsrc)
qcip_set_autoexposure_mode (qcamsrc->autoexposure);
}
-static GstBuffer*
+static GstData*
gst_qcamsrc_get (GstPad *pad)
{
GstQCamSrc *qcamsrc;
@@ -275,7 +275,7 @@ gst_qcamsrc_get (GstPad *pad)
memset (outdata+frame, 128, frame>>1);
g_free (scan);
- return buf;
+ return GST_DATA (buf);
}
static void
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 015e3c43..7a0094bd 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -74,7 +74,7 @@ static GstPadLinkReturn gst_v4l2src_srcconnect (GstPad *pad,
GstCaps *caps);
static GstCaps * gst_v4l2src_getcaps (GstPad *pad,
GstCaps *caps);
-static GstBuffer * gst_v4l2src_get (GstPad *pad);
+static GstData * gst_v4l2src_get (GstPad *pad);
/* get/set params */
static void gst_v4l2src_set_property (GObject *object,
@@ -765,7 +765,7 @@ gst_v4l2src_getcaps (GstPad *pad,
}
-static GstBuffer*
+static GstData*
gst_v4l2src_get (GstPad *pad)
{
GstV4l2Src *v4l2src;
@@ -874,7 +874,7 @@ gst_v4l2src_get (GstPad *pad)
g_signal_emit(G_OBJECT(v4l2src),
gst_v4l2src_signals[SIGNAL_FRAME_CAPTURE], 0);
- return buf;
+ return GST_DATA (buf);
}
diff --git a/sys/vcd/vcdsrc.c b/sys/vcd/vcdsrc.c
index 272b530c..1ee3a83d 100644
--- a/sys/vcd/vcdsrc.c
+++ b/sys/vcd/vcdsrc.c
@@ -68,7 +68,7 @@ static void vcdsrc_init (VCDSrc *vcdsrc);
static void vcdsrc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
static void vcdsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static GstBuffer * vcdsrc_get (GstPad *pad);
+static GstData * vcdsrc_get (GstPad *pad);
/*static GstBuffer * vcdsrc_get_region (GstPad *pad,gulong offset,gulong size); */
static GstElementStateReturn vcdsrc_change_state (GstElement *element);
@@ -222,7 +222,7 @@ vcdsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *
}
}
-static GstBuffer *
+static GstData *
vcdsrc_get (GstPad *pad)
{
VCDSrc *vcdsrc;
@@ -266,7 +266,7 @@ vcdsrc_get (GstPad *pad)
if (++error_count > vcdsrc->max_errors)
{
gst_element_set_eos (GST_ELEMENT (vcdsrc));
- return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
+ return GST_DATA (gst_event_new (GST_EVENT_EOS));
}
fprintf (stderr, "%s while reading raw data from cdrom at %d:%d:%d\n",
@@ -283,7 +283,7 @@ vcdsrc_get (GstPad *pad)
GST_BUFFER_SIZE(buf) = vcdsrc->bytes_per_read;
vcdsrc->curoffset += 1;
- return buf;
+ return GST_DATA (buf);
}
/* open the file, necessary to go to RUNNING state */