Fix the fixate functions to handle new prototype:

Original commit message from CVS:
Fix the fixate functions to handle new prototype:
* gst/sine/gstsinesrc.c: (gst_sinesrc_src_fixate):
* gst/videotestsrc/gstvideotestsrc.c:
(gst_videotestsrc_src_fixate):
* sys/oss/gstosssink.c: (gst_osssink_sink_fixate):
* sys/ximage/ximagesink.c: (gst_ximagesink_fixate):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_fixate):

diff --git a/ChangeLog b/ChangeLog
index 314f39490bff4ee29b3d9e76d28b575f95752115..8f2752a5cb423dbf441f354862404da31ed0a83a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-04  David Schleef  <ds@schleef.org>
+
+       Fix the fixate functions to handle new prototype:
+       * gst/sine/gstsinesrc.c: (gst_sinesrc_src_fixate):
+       * gst/videotestsrc/gstvideotestsrc.c:
+       (gst_videotestsrc_src_fixate):
+       * sys/oss/gstosssink.c: (gst_osssink_sink_fixate):
+       * sys/ximage/ximagesink.c: (gst_ximagesink_fixate):
+       * sys/xvimage/xvimagesink.c: (gst_xvimagesink_fixate):
+
 2004-01-04  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
        * sys/ximage/ximagesink.h:

diff --git a/gst/sine/gstsinesrc.c b/gst/sine/gstsinesrc.c
index eae6345c48596c92d89c439d4a6efcf321858865..36f7244af79094d6bb865572c3b21b382b6e4b3d 100644 (file)
--- a/gst/sine/gstsinesrc.c
+++ b/gst/sine/gstsinesrc.c
@@ -99,7 +99,7 @@ static gboolean     gst_sinesrc_src_query           (GstPad      *pad,
                                                     gint64      *value);
 
 static GstData*   gst_sinesrc_get                  (GstPad *pad);
-static GstCaps * gst_sinesrc_src_fixate (GstPad *pad, const GstCaps *caps, gpointer user_data);
+static GstCaps * gst_sinesrc_src_fixate (GstPad *pad, const GstCaps *caps);
 
 static GstElementClass *parent_class = NULL;
 /*static guint gst_sinesrc_signals[LAST_SIGNAL] = { 0 }; */
@@ -216,8 +216,7 @@ gst_sinesrc_init (GstSineSrc *src)
 }
 
 static GstCaps *
-gst_sinesrc_src_fixate (GstPad *pad, const GstCaps *caps,
-    gpointer user_data)
+gst_sinesrc_src_fixate (GstPad *pad, const GstCaps *caps)
 {
   GstStructure *structure;
   GstCaps *newcaps;

diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c
index 8f37587b3af5a490f3f181d3fa38b158e3e1d7e7..f9a7fe2589182d54e622face90710ea8346fc822 100644 (file)
--- a/gst/videotestsrc/gstvideotestsrc.c
+++ b/gst/videotestsrc/gstvideotestsrc.c
@@ -194,8 +194,7 @@ gst_videotestsrc_set_clock (GstElement *element, GstClock *clock)
 }
 
 static GstCaps *
-gst_videotestsrc_src_fixate (GstPad * pad, const GstCaps * caps,
-    gpointer user_data)
+gst_videotestsrc_src_fixate (GstPad * pad, const GstCaps * caps)
 {
   GstStructure *structure;
   GstCaps *newcaps;

diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 64463b40451d9939d49382c49e8f1ad1a6e52ea2..b9eb7504c546e68330122e42a8ba565db36bb8fe 100644 (file)
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -510,7 +510,7 @@ gst_ximagesink_xcontext_clear (GstXImageSink *ximagesink)
 /* Element stuff */
 
 static GstCaps *
-gst_ximagesink_fixate (GstPad *pad, const GstCaps *caps, gpointer ignore)
+gst_ximagesink_fixate (GstPad *pad, const GstCaps *caps)
 {
   GstStructure *structure;
   GstCaps *newcaps;

diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index fc41d39d6b0bef0aa86a5f952170561d7066dd0f..27de14cd4babec3b5e436207ab0a9044bc37e01d 100644 (file)
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -605,7 +605,7 @@ gst_xvimagesink_xcontext_clear (GstXvImageSink *xvimagesink)
 /* Element stuff */
 
 static GstCaps *
-gst_xvimagesink_fixate (GstPad *pad, const GstCaps *caps, gpointer ignore)
+gst_xvimagesink_fixate (GstPad *pad, const GstCaps *caps)
 {
   GstStructure *structure;
   GstCaps *newcaps;