summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2003-10-09 02:23:01 +0000
committerDavid Schleef <ds@schleef.org>2003-10-09 02:23:01 +0000
commita6df126cb93da232507f2645686eb1a5888e9085 (patch)
tree1e99858edc16a123d04bbd68398826da087b1aa0
parent7f220280ae9aebc76ebff6da6baf8f54d45b992d (diff)
downloadgst-plugins-bad-a6df126cb93da232507f2645686eb1a5888e9085.tar.gz
gst-plugins-bad-a6df126cb93da232507f2645686eb1a5888e9085.tar.bz2
gst-plugins-bad-a6df126cb93da232507f2645686eb1a5888e9085.zip
Trivial fixes for GstBuffer->GstData migration
Original commit message from CVS: Trivial fixes for GstBuffer->GstData migration
-rw-r--r--ext/arts/gst_artsio_impl.cc14
-rw-r--r--gst/speed/gstspeed.c4
2 files changed, 9 insertions, 9 deletions
diff --git a/ext/arts/gst_artsio_impl.cc b/ext/arts/gst_artsio_impl.cc
index 876e2b5b..71cfea85 100644
--- a/ext/arts/gst_artsio_impl.cc
+++ b/ext/arts/gst_artsio_impl.cc
@@ -19,7 +19,7 @@ class ArtsStereoSink_impl : virtual public ArtsStereoSink_skel,
GstPad *sinkpad;
GstPad *srcpad;
unsigned long remainingsamples;
- GstBuffer *inbuf;
+ GstData *inbuf;
unsigned char *dataptr;
public:
@@ -41,8 +41,8 @@ public:
if (remainingsamples == 0) {
//fprintf(stderr,"need to get a buffer\n");
if (inbuf) {
- gst_buffer_unref(inbuf);
- inbuf = 0;
+ gst_data_unref(inbuf);
+ inbuf = NULL;
}
// start by pulling a buffer from GStreamer
@@ -54,12 +54,12 @@ public:
default:
break;
}
- gst_pad_event_default (srcpad, (GstEvent*)inbuf);
+ gst_pad_event_default (srcpad, GST_EVENT(inbuf));
inbuf = gst_pad_pull (sinkpad);
}
- dataptr = GST_BUFFER_DATA(inbuf);
- remainingsamples = GST_BUFFER_SIZE(inbuf) / 4;
+ dataptr = GST_BUFFER_DATA(GST_BUFFER(inbuf));
+ remainingsamples = GST_BUFFER_SIZE(GST_BUFFER(inbuf)) / 4;
//fprintf(stderr,"got a buffer with %d samples\n",remainingsamples);
}
@@ -107,7 +107,7 @@ public:
convert_stereo_2float_i16le(samples,inleft,inright,GST_BUFFER_DATA(outbuf));
//s = (gint16 *)GST_BUFFER_DATA(outbuf);
//fprintf(stderr,"samples in are %f and %f, out are %d and %d\n",inleft[0],inright[0],s[0],s[1]);
- gst_pad_push(srcpad,outbuf);
+ gst_pad_push(srcpad,GST_DATA(outbuf));
outbuf = NULL;
}
diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c
index f0a357ec..0137e807 100644
--- a/gst/speed/gstspeed.c
+++ b/gst/speed/gstspeed.c
@@ -67,7 +67,7 @@ speed_sink_factory (void)
template = gst_pad_template_new
("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
gst_caps_append(gst_caps_new ("sink_int", "audio/x-raw-int",
- GST_AUDIO_INT_STANDARD_PAD_TEMPLATE_PROPS),
+ GST_AUDIO_INT_PAD_TEMPLATE_PROPS),
gst_caps_new ("sink_float", "audio/x-raw-float",
GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS)),
NULL);
@@ -86,7 +86,7 @@ speed_src_factory (void)
gst_caps_append (gst_caps_new ("src_float", "audio/x-raw-float",
GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS),
gst_caps_new ("src_int", "audio/x-raw-int",
- GST_AUDIO_INT_STANDARD_PAD_TEMPLATE_PROPS)),
+ GST_AUDIO_INT_PAD_TEMPLATE_PROPS)),
NULL);
return template;