Fix plugins for new query API

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

13 files changed, 85 insertions, 93 deletions

diff --git a/examples/indexing/indexmpeg.c b/examples/indexing/indexmpeg.c
index fc5b83fb4..10215a0e9 100644
--- a/examples/indexing/indexmpeg.c
+++ b/examples/indexing/indexmpeg.c
@@ -175,7 +175,7 @@ print_progress (GstPad *pad)
   status[0] = '|';
 
   format = GST_FORMAT_PERCENT;
-  res = gst_pad_query (pad, GST_PAD_QUERY_POSITION, &format, &value);
+  res = gst_pad_query (pad, GST_QUERY_POSITION, &format, &value);
   if (res) {
     percent = value / (2 * GST_FORMAT_PERCENT_SCALE); 
   }
@@ -222,7 +222,6 @@ main (gint argc, gchar *argv[])
 
   /* create index that elements can fill */
   index = gst_index_factory_make ("memindex");
-  index = NULL;
   if (verbose && index)
     g_signal_connect (G_OBJECT (index), "entry_added", G_CALLBACK (entry_added), NULL);
 
diff --git a/examples/seeking/cdparanoia.c b/examples/seeking/cdparanoia.c
index ec047f958..db7223ffe 100644
--- a/examples/seeking/cdparanoia.c
+++ b/examples/seeking/cdparanoia.c
@@ -24,7 +24,7 @@ get_position_info (GstElement *cdparanoia)
     definition = gst_format_get_details (*formats);
 
     format = *formats;
-    res = gst_pad_query (pad, GST_PAD_QUERY_POSITION,
+    res = gst_pad_query (pad, GST_QUERY_POSITION,
 		         &format, &position);
 
     if (format == GST_FORMAT_TIME) {
@@ -70,7 +70,7 @@ get_track_info (GstElement *cdparanoia)
     definition = gst_format_get_details (*formats);
 
     format = *formats;
-    res = gst_pad_query (pad, GST_PAD_QUERY_TOTAL,
+    res = gst_pad_query (pad, GST_QUERY_TOTAL,
 		         &format, &total);
     if (res) {
       if (format == GST_FORMAT_TIME) {
diff --git a/examples/seeking/cdplayer.c b/examples/seeking/cdplayer.c
index a833c67a5..359210237 100644
--- a/examples/seeking/cdplayer.c
+++ b/examples/seeking/cdplayer.c
@@ -13,31 +13,19 @@ static guint64 duration;
 
 static guint update_id;
 
-//#define SOURCE "gnomevfssrc"
-#define SOURCE "filesrc"
-
 #define UPDATE_INTERVAL 500
 
 static GstElement*
-make_cdaudio_pipeline (gboolean thread) 
+make_cdaudio_pipeline (void) 
 {
-  GstElement *pipeline;
   GstElement *cdaudio;
   
-  if (thread) {
-    pipeline = gst_thread_new ("app");
-  }
-  else {
-    pipeline = gst_pipeline_new ("app");
-  }
-  
   cdaudio = gst_element_factory_make ("cdaudio", "cdaudio");
-
-  gst_bin_add (GST_BIN (pipeline), cdaudio);
+  g_assert (cdaudio != NULL);
 
   seekable_elements = g_list_prepend (seekable_elements, cdaudio);
 
-  return pipeline;
+  return cdaudio;
 }
 
 static gchar*
@@ -91,7 +79,7 @@ query_durations ()
       GstFormat format;
 
       format = seek_formats[i].format;
-      res = gst_element_query (element, GST_PAD_QUERY_TOTAL, &format, &value);
+      res = gst_element_query (element, GST_QUERY_TOTAL, &format, &value);
       if (res) {
         g_print ("%s %13lld | ", seek_formats[i].name, value);
       }
@@ -121,7 +109,7 @@ query_positions ()
       GstFormat format;
 
       format = seek_formats[i].format;
-      res = gst_element_query (element, GST_PAD_QUERY_POSITION, &format, &value);
+      res = gst_element_query (element, GST_QUERY_POSITION, &format, &value);
       if (res) {
         g_print ("%s %13lld | ", seek_formats[i].name, value);
       }
@@ -139,7 +127,7 @@ static gboolean
 update_scale (gpointer data) 
 {
   GstClock *clock;
-  guint64 position;
+  guint64 position = 0;
   GstFormat format = GST_FORMAT_TIME;
 
   duration = 0;
@@ -147,12 +135,14 @@ update_scale (gpointer data)
 
   if (seekable_elements) {
     GstElement *element = GST_ELEMENT (seekable_elements->data);
-    gst_element_query (element, GST_PAD_QUERY_TOTAL, &format, &duration);
+    gst_element_query (element, GST_QUERY_TOTAL, &format, &duration);
   }
-  position = gst_clock_get_time (clock);
+  if (clock)
+    position = gst_clock_get_time (clock);
 
   if (stats) {
-    g_print ("clock:                  %13llu  (%s)\n", position, gst_object_get_name (GST_OBJECT (clock)));
+    if (clock)
+      g_print ("clock:                  %13llu  (%s)\n", position, gst_object_get_name (GST_OBJECT (clock)));
     query_durations ();
     query_positions ();
   }
@@ -168,6 +158,7 @@ iterate (gpointer data)
 {
   gboolean res = TRUE;
 
+  g_print ("iterate\n");
   res = gst_bin_iterate (GST_BIN (data));
   if (!res) {
     gtk_timeout_remove (update_id);
@@ -249,10 +240,7 @@ main (int argc, char **argv)
   GtkWidget *window, *hbox, *vbox, 
             *play_button, *pause_button, *stop_button, 
 	    *hscale;
-  gboolean threaded = FALSE;
   struct poptOption options[] = {
-    {"threaded",  't',  POPT_ARG_NONE|POPT_ARGFLAG_STRIP,   &threaded,   0,
-         "Run the pipeline in a toplevel thread", NULL},
     {"stats",  's',  POPT_ARG_NONE|POPT_ARGFLAG_STRIP,   &stats,   0,
          "Show element stats", NULL},
      POPT_TABLEEND
@@ -261,7 +249,10 @@ main (int argc, char **argv)
   gst_init_with_popt_table (&argc, &argv, options);
   gtk_init (&argc, &argv);
 
-  pipeline = make_cdaudio_pipeline (threaded);
+  pipeline = make_cdaudio_pipeline ();
+
+  g_signal_connect (pipeline, "deep_notify", G_CALLBACK (gst_element_default_deep_notify), NULL);
+  g_signal_connect (pipeline, "error", G_CALLBACK (gst_element_default_error), NULL);
 
   /* initialize gui elements ... */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -303,6 +294,8 @@ main (int argc, char **argv)
 
   gtk_main ();
 
+  gst_element_set_state (pipeline, GST_STATE_NULL);
+
   gst_buffer_print_stats();
   gst_event_print_stats();
 
diff --git a/examples/seeking/seek.c b/examples/seeking/seek.c
index 49b3a5080..b8fcad774 100644
--- a/examples/seeking/seek.c
+++ b/examples/seeking/seek.c
@@ -407,7 +407,7 @@ make_mpeg_pipeline (const gchar *location)
   g_object_set (G_OBJECT (src), "location", location, NULL);
 
   demux = gst_element_factory_make_or_warn ("mpegdemux", "demux");
-  //g_object_set (G_OBJECT (demux), "sync", TRUE, NULL);
+  g_object_set (G_OBJECT (demux), "sync", TRUE, NULL);
 
   seekable_elements = g_list_prepend (seekable_elements, demux);
 
@@ -604,7 +604,7 @@ query_durations ()
       GstFormat format;
 
       format = seek_formats[i].format;
-      res = gst_pad_query (pad, GST_PAD_QUERY_TOTAL, &format, &value);
+      res = gst_pad_query (pad, GST_QUERY_TOTAL, &format, &value);
       if (res) {
         g_print ("%s %13lld | ", seek_formats[i].name, value);
       }
@@ -635,7 +635,7 @@ query_positions ()
       GstFormat format;
 
       format = seek_formats[i].format;
-      res = gst_pad_query (pad, GST_PAD_QUERY_POSITION, &format, &value);
+      res = gst_pad_query (pad, GST_QUERY_POSITION, &format, &value);
       if (res) {
         g_print ("%s %13lld | ", seek_formats[i].name, value);
       }
@@ -662,7 +662,7 @@ update_scale (gpointer data)
 
   if (seekable_pads) {
     GstPad *pad = GST_PAD (seekable_pads->data);
-    gst_pad_query (pad, GST_PAD_QUERY_TOTAL, &format, &duration);
+    gst_pad_query (pad, GST_QUERY_TOTAL, &format, &duration);
   }
   position = gst_clock_get_time (clock);
 
diff --git a/examples/seeking/spider_seek.c b/examples/seeking/spider_seek.c
index 849bafaaf..6c88ae441 100644
--- a/examples/seeking/spider_seek.c
+++ b/examples/seeking/spider_seek.c
@@ -153,7 +153,7 @@ query_durations ()
       GstFormat format;
 
       format = seek_formats[i].format;
-      res = gst_element_query (element, GST_PAD_QUERY_TOTAL, &format, &value);
+      res = gst_element_query (element, GST_QUERY_TOTAL, &format, &value);
       if (res) {
         g_print ("%s %13lld | ", seek_formats[i].name, value);
       }
@@ -183,7 +183,7 @@ query_positions ()
       GstFormat format;
 
       format = seek_formats[i].format;
-      res = gst_element_query (element, GST_PAD_QUERY_POSITION, &format, &value);
+      res = gst_element_query (element, GST_QUERY_POSITION, &format, &value);
       if (res) {
         g_print ("%s %13lld | ", seek_formats[i].name, value);
       }
@@ -209,7 +209,7 @@ update_scale (gpointer data)
 
   if (seekable_elements) {
     GstElement *element = GST_ELEMENT (seekable_elements->data);
-    gst_element_query (element, GST_PAD_QUERY_TOTAL, &format, &duration);
+    gst_element_query (element, GST_QUERY_TOTAL, &format, &duration);
   }
   position = gst_clock_get_time (clock);
 
diff --git a/examples/seeking/vorbisfile.c b/examples/seeking/vorbisfile.c
index 489c5c644..304c18511 100644
--- a/examples/seeking/vorbisfile.c
+++ b/examples/seeking/vorbisfile.c
@@ -230,7 +230,7 @@ collect_stream_properties (struct probe_context *context)
     format = *formats;
     formats++;
 
-    res = gst_pad_query (context->pad, GST_PAD_QUERY_TOTAL, 
+    res = gst_pad_query (context->pad, GST_QUERY_TOTAL, 
 		         &format, &value);
 
     definition = gst_format_get_details (format);
diff --git a/examples/stats/mp2ogg.c b/examples/stats/mp2ogg.c
index 273a349ac..e5d3fbd9b 100644
--- a/examples/stats/mp2ogg.c
+++ b/examples/stats/mp2ogg.c
@@ -71,11 +71,11 @@ main (gint argc, gchar *argv[])
 
     format = GST_FORMAT_TIME;
     /* get the position */
-    gst_pad_query (enc_src, GST_PAD_QUERY_POSITION, 
+    gst_pad_query (enc_src, GST_QUERY_POSITION, 
 		   &format, &position);
 
     /* get the total duration */
-    gst_pad_query (enc_src, GST_PAD_QUERY_TOTAL, 
+    gst_pad_query (enc_src, GST_QUERY_TOTAL, 
 		   &format, &duration);
 
     format = GST_FORMAT_BYTES;
diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c
index 1d41f0c51..2983097f4 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 1707d0e16..bd29b09f7 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 }
 );
 
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index a44554b30..966a13d8d 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -169,9 +169,9 @@ static const GstEventMask*
 			gst_avi_demux_get_event_mask 		(GstPad *pad);
 static gboolean 	gst_avi_demux_handle_src_event 		(GstPad *pad, GstEvent *event);
 static const GstFormat* gst_avi_demux_get_src_formats 		(GstPad *pad); 
-static const GstPadQueryType*
+static const GstQueryType*
 			gst_avi_demux_get_src_query_types 	(GstPad *pad);
-static gboolean 	gst_avi_demux_handle_src_query 		(GstPad *pad, GstPadQueryType type, 
+static gboolean 	gst_avi_demux_handle_src_query 		(GstPad *pad, GstQueryType type, 
 								 GstFormat *format, gint64 *value);
 static gboolean 	gst_avi_demux_src_convert 		(GstPad *pad, GstFormat src_format, gint64 src_value,
 	        	          				 GstFormat *dest_format, gint64 *dest_value);
@@ -872,12 +872,12 @@ gst_avi_demux_src_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
   return res;
 }
 
-static const GstPadQueryType*
+static const GstQueryType*
 gst_avi_demux_get_src_query_types (GstPad *pad) 
 {
-  static const GstPadQueryType src_types[] = {
-    GST_PAD_QUERY_TOTAL,
-    GST_PAD_QUERY_POSITION,
+  static const GstQueryType src_types[] = {
+    GST_QUERY_TOTAL,
+    GST_QUERY_POSITION,
     0
   };
 
@@ -885,7 +885,7 @@ gst_avi_demux_get_src_query_types (GstPad *pad)
 }
 
 static gboolean
-gst_avi_demux_handle_src_query (GstPad *pad, GstPadQueryType type, 
+gst_avi_demux_handle_src_query (GstPad *pad, GstQueryType type, 
 				GstFormat *format, gint64 *value)
 {
   gboolean res = TRUE;
@@ -893,7 +893,7 @@ gst_avi_demux_handle_src_query (GstPad *pad, GstPadQueryType type,
   avi_stream_context *stream = gst_pad_get_element_private (pad);
 
   switch (type) {
-    case GST_PAD_QUERY_TOTAL:
+    case GST_QUERY_TOTAL:
       switch (*format) {
         case GST_FORMAT_DEFAULT:
           *format = GST_FORMAT_TIME;
@@ -921,7 +921,7 @@ gst_avi_demux_handle_src_query (GstPad *pad, GstPadQueryType type,
 	  break;
       }
       break;
-    case GST_PAD_QUERY_POSITION:
+    case GST_QUERY_POSITION:
       switch (*format) {
         case GST_FORMAT_DEFAULT:
           *format = GST_FORMAT_TIME;
@@ -1341,7 +1341,7 @@ gst_avi_demux_process_chunk (GstAviDemux *avi_demux, guint64 *filepos,
 		    chunkid, *chunksize, stream_id);
 
       format = GST_FORMAT_TIME;
-      gst_pad_query (stream->pad, GST_PAD_QUERY_POSITION, &format, &next_ts);
+      gst_pad_query (stream->pad, GST_QUERY_POSITION, &format, &next_ts);
 
       if (stream->strh.init_frames == stream->current_frame && stream->delay==0)
 	stream->delay = next_ts;
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index ab6fceb40..8eb863b84 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -28,10 +28,10 @@ static void		gst_wavparse_init	(GstWavParse *wavparse);
 static GstCaps*		wav_type_find		(GstBuffer *buf, gpointer private);
 
 static const GstFormat*	gst_wavparse_get_formats	(GstPad *pad);
-static const GstPadQueryType *
+static const GstQueryType *
 			gst_wavparse_get_query_types	(GstPad *pad);
 static gboolean		gst_wavparse_pad_query	(GstPad *pad, 
-		                                 GstPadQueryType type,
+		                                 GstQueryType type,
 						 GstFormat *format, 
 						 gint64 *value);
 static gboolean		gst_wavparse_pad_convert (GstPad *pad,
@@ -455,19 +455,19 @@ gst_wavparse_pad_convert (GstPad *pad,
   return TRUE;
 }
       
-static const GstPadQueryType *
+static const GstQueryType *
 gst_wavparse_get_query_types (GstPad *pad)
 {
-  static const GstPadQueryType types[] = {
-    GST_PAD_QUERY_TOTAL,
-    GST_PAD_QUERY_POSITION
+  static const GstQueryType types[] = {
+    GST_QUERY_TOTAL,
+    GST_QUERY_POSITION
   };
   return types;
 }
 
 /* handle queries for location and length in requested format */
 static gboolean
-gst_wavparse_pad_query (GstPad *pad, GstPadQueryType type,
+gst_wavparse_pad_query (GstPad *pad, GstQueryType type,
 			GstFormat *format, gint64 *value)
 {
   GstFormat peer_format = GST_FORMAT_BYTES;
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index 86ca1f3f7..a37036c0a 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -49,10 +49,10 @@ static GstClockTime 		gst_osssink_get_time 		(GstClock *clock, gpointer data);
 static const GstFormat* 	gst_osssink_get_formats 	(GstPad *pad);
 static gboolean 		gst_osssink_convert 		(GstPad *pad, GstFormat src_format, gint64 src_value,
 	            						 GstFormat *dest_format, gint64 *dest_value);
-static const GstPadQueryType* 	gst_osssink_get_query_types 	(GstPad *pad);
-static gboolean 		gst_osssink_query 		(GstElement *element, GstPadQueryType type, 
+static const GstQueryType* 	gst_osssink_get_query_types 	(GstPad *pad);
+static gboolean 		gst_osssink_query 		(GstElement *element, GstQueryType type, 
 								 GstFormat *format, gint64 *value);
-static gboolean 		gst_osssink_sink_query 		(GstPad *pad, GstPadQueryType type,
+static gboolean 		gst_osssink_sink_query 		(GstPad *pad, GstQueryType type,
 								 GstFormat *format, gint64 *value);
 
 static GstPadConnectReturn	gst_osssink_sinkconnect		(GstPad *pad, GstCaps *caps);
@@ -432,19 +432,19 @@ gst_osssink_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
 		                dest_format, dest_value);
 }
 
-static const GstPadQueryType*
+static const GstQueryType*
 gst_osssink_get_query_types (GstPad *pad)
 {
-  static const GstPadQueryType query_types[] = {
-    GST_PAD_QUERY_LATENCY,
-    GST_PAD_QUERY_POSITION,
+  static const GstQueryType query_types[] = {
+    GST_QUERY_LATENCY,
+    GST_QUERY_POSITION,
     0,
   };
   return query_types;
 }
 
 static gboolean
-gst_osssink_sink_query (GstPad *pad, GstPadQueryType type, GstFormat *format, gint64 *value) 
+gst_osssink_sink_query (GstPad *pad, GstQueryType type, GstFormat *format, gint64 *value) 
 {
   gboolean res = TRUE;
   GstOssSink *osssink;
@@ -452,7 +452,7 @@ gst_osssink_sink_query (GstPad *pad, GstPadQueryType type, GstFormat *format, gi
   osssink = GST_OSSSINK (gst_pad_get_parent (pad));
   
   switch (type) {
-    case GST_PAD_QUERY_LATENCY:
+    case GST_QUERY_LATENCY:
       if (!gst_osssink_convert (pad, 
 			        GST_FORMAT_BYTES, gst_osssink_get_delay (osssink),
 		                format, value)) 
@@ -460,7 +460,7 @@ gst_osssink_sink_query (GstPad *pad, GstPadQueryType type, GstFormat *format, gi
         res = FALSE;
       }
       break;
-    case GST_PAD_QUERY_POSITION:
+    case GST_QUERY_POSITION:
       if (!gst_osssink_convert (pad, 
 			        GST_FORMAT_TIME, gst_clock_get_time (osssink->provided_clock),
 		                format, value)) 
@@ -477,7 +477,7 @@ gst_osssink_sink_query (GstPad *pad, GstPadQueryType type, GstFormat *format, gi
 }
 
 static gboolean
-gst_osssink_query (GstElement *element, GstPadQueryType type, GstFormat *format, gint64 *value) 
+gst_osssink_query (GstElement *element, GstQueryType type, GstFormat *format, gint64 *value) 
 {
   GstOssSink *osssink = GST_OSSSINK (element);
 
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index b3f516933..83c32f7b3 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -100,8 +100,8 @@ static GstElementStateReturn 	gst_osssrc_change_state	(GstElement *element);
 static const GstEventMask* 	gst_osssrc_get_event_masks (GstPad *pad);
 static gboolean 		gst_osssrc_src_event 	(GstPad *pad, GstEvent *event);
 static gboolean                 gst_osssrc_send_event 	(GstElement *element, GstEvent *event);
-static const GstPadQueryType* 	gst_osssrc_get_query_types (GstPad *pad);
-static gboolean 		gst_osssrc_src_query 	(GstPad *pad, GstPadQueryType type, 
+static const GstQueryType* 	gst_osssrc_get_query_types (GstPad *pad);
+static gboolean 		gst_osssrc_src_query 	(GstPad *pad, GstQueryType type, 
 							 GstFormat *format, gint64 *value);
 
 static GstBuffer *		gst_osssrc_get		(GstPad *pad);
@@ -459,18 +459,18 @@ gst_osssrc_send_event (GstElement *element,
   return gst_osssrc_src_event (osssrc->srcpad, event);
 }
 
-static const GstPadQueryType*
+static const GstQueryType*
 gst_osssrc_get_query_types (GstPad *pad)
 {
-  static const GstPadQueryType query_types[] = {
-    GST_PAD_QUERY_POSITION,
+  static const GstQueryType query_types[] = {
+    GST_QUERY_POSITION,
     0,
   };
   return query_types;
 } 
 
 static gboolean
-gst_osssrc_src_query (GstPad *pad, GstPadQueryType type, GstFormat *format, gint64 *value)
+gst_osssrc_src_query (GstPad *pad, GstQueryType type, GstFormat *format, gint64 *value)
 {
   gboolean res = FALSE;
   GstOssSrc *osssrc;
@@ -478,7 +478,7 @@ gst_osssrc_src_query (GstPad *pad, GstPadQueryType type, GstFormat *format, gint
   osssrc = GST_OSSSRC (gst_pad_get_parent (pad));
 	        
   switch (type) {
-    case GST_PAD_QUERY_POSITION:
+    case GST_QUERY_POSITION:
       res = gst_osscommon_convert (&osssrc->common, 
 		      		   GST_FORMAT_BYTES, osssrc->curoffset,
                                    format, value);