From e3eccad80826c629ac21117706157782471795db Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Wed, 4 Feb 2004 19:28:51 +0000
Subject: Replace use of GST_PAD_FORMATS_FUNCTION() and similar macros with the
 code that they would expand to.

Original commit message from CVS:
Replace use of GST_PAD_FORMATS_FUNCTION() and similar macros
with the code that they would expand to.
* ext/flac/gstflacdec.c: (gst_flacdec_get_src_formats),
(gst_flacdec_get_src_query_types),
(gst_flacdec_get_src_event_masks):
* ext/gnomevfs/gstgnomevfssrc.c: (gst_gnomevfssrc_get_formats),
(gst_gnomevfssrc_get_query_types),
(gst_gnomevfssrc_get_event_mask):
---
 ext/flac/gstflacdec.c | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

(limited to 'ext')

diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 094d349a..f468838c 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -579,11 +579,18 @@ gst_flacdec_loop (GstElement *element)
   GST_DEBUG ("flacdec: _loop end");
 }
 
-GST_PAD_FORMATS_FUNCTION (gst_flacdec_get_src_formats,
-  GST_FORMAT_DEFAULT,
-  GST_FORMAT_BYTES,
-  GST_FORMAT_TIME
-)
+
+static const GstFormat *
+gst_flacdec_get_src_formats (GstPad *pad)
+{ 
+  static const GstFormat formats[] = {
+    GST_FORMAT_DEFAULT,
+    GST_FORMAT_BYTES,
+    GST_FORMAT_TIME,
+    0,
+  };
+  return formats;
+} 
 
 static gboolean
 gst_flacdec_convert_src (GstPad *pad, GstFormat src_format, gint64 src_value,
@@ -648,10 +655,16 @@ gst_flacdec_convert_src (GstPad *pad, GstFormat src_format, gint64 src_value,
   return res;
 }
 
-GST_PAD_QUERY_TYPE_FUNCTION (gst_flacdec_get_src_query_types,
-  GST_QUERY_TOTAL,
-  GST_QUERY_POSITION
-)
+static const GstQueryType *
+gst_flacdec_get_src_query_types (GstPad *pad)
+{ 
+  static const GstQueryType types[] = {
+    GST_QUERY_TOTAL,
+    GST_QUERY_POSITION,
+    0,
+  };
+  return types;
+} 
 
 static gboolean
 gst_flacdec_src_query (GstPad *pad, GstQueryType type,
@@ -690,9 +703,15 @@ gst_flacdec_src_query (GstPad *pad, GstQueryType type,
   return res;
 }
 	  
-GST_PAD_EVENT_MASK_FUNCTION (gst_flacdec_get_src_event_masks,
-    { GST_EVENT_SEEK, GST_SEEK_FLAG_ACCURATE }
-);
+static const GstEventMask *
+gst_flacdec_get_src_event_masks (GstPad *pad)
+{
+  static const GstEventMask masks[] = {
+    { GST_EVENT_SEEK, GST_SEEK_FLAG_ACCURATE },
+    { 0, 0 },
+  };
+  return masks;
+}
 
 static gboolean
 gst_flacdec_src_event (GstPad *pad, GstEvent *event)
-- 
cgit