From 8b3c0de75a17876fa2c56263f96e7045a6b61b25 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 9 Oct 2003 02:23:01 +0000 Subject: [PATCH] Trivial fixes for GstBuffer->GstData migration Original commit message from CVS: Trivial fixes for GstBuffer->GstData migration --- ext/dvdnav/dvdnavsrc.c | 6 +++--- ext/sidplay/gstsiddec.cc | 17 ++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c index 4a4a78c5d5..907c324bbe 100644 --- a/ext/dvdnav/dvdnavsrc.c +++ b/ext/dvdnav/dvdnavsrc.c @@ -853,12 +853,12 @@ dvdnavsrc_get (GstPad *pad) GST_DEBUG ("dvdnavsrc sending discont"); event = gst_event_new_discontinuous (FALSE, 0); src->need_flush = FALSE; - return GST_BUFFER (event); + return GST_DATA (event); } if (src->need_flush) { src->need_flush = FALSE; GST_DEBUG ("dvdnavsrc sending flush"); - return GST_BUFFER (gst_event_new_flush()); + return GST_DATA (gst_event_new_flush()); } /* loop processing blocks until data is pushed */ @@ -927,7 +927,7 @@ dvdnavsrc_get (GstPad *pad) break; } } - return buf; + return GST_DATA(buf); } /* open the file, necessary to go to RUNNING state */ diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc index 4095277aa6..da7e11d9f4 100644 --- a/ext/sidplay/gstsiddec.cc +++ b/ext/sidplay/gstsiddec.cc @@ -401,13 +401,14 @@ gst_siddec_loop (GstElement *element) siddec = GST_SIDDEC (element); if (siddec->state == SID_STATE_NEED_TUNE) { - GstBuffer *buf = gst_pad_pull (siddec->sinkpad); - g_assert (buf != NULL); - - if (GST_IS_EVENT (buf)) { - GstEvent *event = GST_EVENT (buf); + GstData *data = gst_pad_pull (siddec->sinkpad); - switch (GST_EVENT_TYPE (buf)) { + g_assert (data != NULL); + + if (GST_IS_EVENT (data)) { + GstEvent *event = GST_EVENT (data); + + switch (GST_EVENT_TYPE (event)) { case GST_EVENT_EOS: siddec->state = SID_STATE_LOAD_TUNE; break; @@ -423,6 +424,8 @@ gst_siddec_loop (GstElement *element) gst_event_unref (event); } else { + GstBuffer *buf = GST_BUFFER (data); + memcpy (siddec->tune_buffer+siddec->tune_len, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); siddec->tune_len += GST_BUFFER_SIZE (buf); @@ -475,7 +478,7 @@ gst_siddec_loop (GstElement *element) gst_siddec_src_query (siddec->srcpad, GST_QUERY_POSITION, &format, &value2); GST_BUFFER_DURATION (out) = value2 - value; - gst_pad_push (siddec->srcpad, out); + gst_pad_push (siddec->srcpad, GST_DATA(out)); } }