Fix plugins for new query API

Original commit message from CVS:
Fix plugins for new query API

2 files changed, 19 insertions, 19 deletions

diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c
index 1d41f0c5..2983097f 100644
--- a/ext/dv/gstdvdec.c
+++ b/ext/dv/gstdvdec.c
@@ -189,9 +189,9 @@ gst_dvdec_quality_get_type (void)
 static void		gst_dvdec_class_init		(GstDVDecClass *klass);
 static void		gst_dvdec_init			(GstDVDec *dvdec);
 
-static const GstPadQueryType* 
+static const GstQueryType* 
 			gst_dvdec_get_src_query_types 	(GstPad *pad);
-static gboolean 	gst_dvdec_src_query 		(GstPad *pad, GstPadQueryType type,
+static gboolean 	gst_dvdec_src_query 		(GstPad *pad, GstQueryType type,
                     					 GstFormat *format, gint64 *value);
 static const GstFormat* gst_dvdec_get_formats 		(GstPad *pad);
 static gboolean 	gst_dvdec_sink_convert 		(GstPad *pad, GstFormat src_format, gint64 src_value,
@@ -458,19 +458,19 @@ gst_dvdec_sink_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
   return res;
 }
 
-static const GstPadQueryType*
+static const GstQueryType*
 gst_dvdec_get_src_query_types (GstPad *pad)
 {   
-  static const GstPadQueryType src_query_types[] = {
-    GST_PAD_QUERY_TOTAL,
-    GST_PAD_QUERY_POSITION,
+  static const GstQueryType src_query_types[] = {
+    GST_QUERY_TOTAL,
+    GST_QUERY_POSITION,
     0
   };
   return src_query_types;
 }
 
 static gboolean
-gst_dvdec_src_query (GstPad *pad, GstPadQueryType type,
+gst_dvdec_src_query (GstPad *pad, GstQueryType type,
                      GstFormat *format, gint64 *value)
 {
   gboolean res = TRUE;
@@ -479,7 +479,7 @@ gst_dvdec_src_query (GstPad *pad, GstPadQueryType type,
   dvdec = GST_DVDEC (gst_pad_get_parent (pad));
 
   switch (type) {
-    case GST_PAD_QUERY_TOTAL:
+    case GST_QUERY_TOTAL:
       switch (*format) {
         case GST_FORMAT_DEFAULT:
           *format = GST_FORMAT_TIME;
@@ -504,7 +504,7 @@ gst_dvdec_src_query (GstPad *pad, GstPadQueryType type,
 	}
       }
       break;
-    case GST_PAD_QUERY_POSITION:
+    case GST_QUERY_POSITION:
       switch (*format) {
         case GST_FORMAT_DEFAULT:
           *format = GST_FORMAT_TIME;
@@ -777,7 +777,7 @@ gst_dvdec_loop (GstElement *element)
   }
 
   format = GST_FORMAT_TIME;
-  gst_pad_query (dvdec->videosrcpad, GST_PAD_QUERY_POSITION, &format, &ts);
+  gst_pad_query (dvdec->videosrcpad, GST_QUERY_POSITION, &format, &ts);
 
   /* FIXME this is inaccurate for NTSC */
   dvdec->next_ts += GST_SECOND / dvdec->framerate;
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 1707d0e1..bd29b09f 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -57,9 +57,9 @@ static GstElementStateReturn
 static const GstFormat* gst_flacdec_get_src_formats 	(GstPad *pad);
 static gboolean 	gst_flacdec_convert_src	 	(GstPad *pad, GstFormat src_format, gint64 src_value,
 		        				 GstFormat *dest_format, gint64 *dest_value);
-static const GstPadQueryType* 
+static const GstQueryType* 
 			gst_flacdec_get_src_query_types (GstPad *pad);
-static gboolean		gst_flacdec_src_query 		(GstPad *pad, GstPadQueryType type,
+static gboolean		gst_flacdec_src_query 		(GstPad *pad, GstQueryType type,
 	               					 GstFormat *format, gint64 *value);
 static const GstEventMask* 
 			gst_flacdec_get_src_event_masks (GstPad *pad);
@@ -476,7 +476,7 @@ gst_flacdec_loop (GstElement *element)
    GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: _loop end");
 }
 
-GST_FORMATS_FUNCTION (gst_flacdec_get_src_formats,
+GST_PAD_FORMATS_FUNCTION (gst_flacdec_get_src_formats,
   GST_FORMAT_UNITS,
   GST_FORMAT_BYTES,
   GST_FORMAT_TIME
@@ -552,19 +552,19 @@ gst_flacdec_convert_src (GstPad *pad, GstFormat src_format, gint64 src_value,
 }
 
 GST_PAD_QUERY_TYPE_FUNCTION (gst_flacdec_get_src_query_types,
-  GST_PAD_QUERY_TOTAL,
-  GST_PAD_QUERY_POSITION
+  GST_QUERY_TOTAL,
+  GST_QUERY_POSITION
 )
 
 static gboolean
-gst_flacdec_src_query (GstPad *pad, GstPadQueryType type,
+gst_flacdec_src_query (GstPad *pad, GstQueryType type,
 	               GstFormat *format, gint64 *value)
 {
   gboolean res = TRUE;
   FlacDec *flacdec = GST_FLACDEC (gst_pad_get_parent (pad));
 
   switch (type) {
-    case GST_PAD_QUERY_TOTAL:
+    case GST_QUERY_TOTAL:
     {
       guint64 samples;
 
@@ -579,7 +579,7 @@ gst_flacdec_src_query (GstPad *pad, GstPadQueryType type,
 		       format, value);
       break;
     }
-    case GST_PAD_QUERY_POSITION:
+    case GST_QUERY_POSITION:
       gst_pad_convert (flacdec->srcpad, 
 		       GST_FORMAT_UNITS, 
 		       flacdec->total_samples, 
@@ -593,7 +593,7 @@ gst_flacdec_src_query (GstPad *pad, GstPadQueryType type,
   return res;
 }
 	  
-GST_EVENT_MASK_FUNCTION (gst_flacdec_get_src_event_masks,
+GST_PAD_EVENT_MASK_FUNCTION (gst_flacdec_get_src_event_masks,
     { GST_EVENT_SEEK, GST_SEEK_FLAG_ACCURATE }
 );