From 16b8bd4c49e978faab391665c7d2231929ce9c42 Mon Sep 17 00:00:00 2001
From: Marc-Andre Lureau <marcandre.lureau@gmail.com>
Date: Fri, 18 May 2007 15:10:08 +0000
Subject: [PATCH] gst-libs/gst/interfaces/mixer.h (mixer_type, option_changed,
 set_option, get_option, _gst_reserved):

Original commit message from CVS:
patch by: Marc-Andre Lureau <marcandre.lureau@gmail.com>
* gst-libs/gst/interfaces/mixer.h (mixer_type, option_changed,
set_option, get_option, _gst_reserved):
Revert reordering functions (keep ABI).
---
 ChangeLog                       |  8 ++++++++
 gst-libs/gst/interfaces/mixer.h | 16 +++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d01cc992e..2db05efcbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-18  Stefan Kost  <ensonic@users.sf.net>
+
+	patch by: Marc-Andre Lureau <marcandre.lureau@gmail.com>
+
+	* gst-libs/gst/interfaces/mixer.h (mixer_type, option_changed,
+	  set_option, get_option, _gst_reserved):
+	  Revert reordering functions (keep ABI).
+
 2007-05-17  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_put),
diff --git a/gst-libs/gst/interfaces/mixer.h b/gst-libs/gst/interfaces/mixer.h
index 28c5f1140a..8c6bf6edbe 100644
--- a/gst-libs/gst/interfaces/mixer.h
+++ b/gst-libs/gst/interfaces/mixer.h
@@ -57,7 +57,7 @@ struct _GstMixerClass {
   GTypeInterface klass;
 
   GstMixerType mixer_type;
-  
+
   /* virtual functions */
   const GList *  (* list_tracks)   (GstMixer      *mixer);
 
@@ -74,12 +74,6 @@ struct _GstMixerClass {
   void           (* set_record)    (GstMixer      *mixer,
                                     GstMixerTrack *track,
                                     gboolean       record);
-  void          (* set_option)     (GstMixer      *mixer,
-                                    GstMixerOptions *opts,
-                                    gchar         *value);
-  const gchar * (* get_option)     (GstMixer      *mixer,
-                                    GstMixerOptions *opts);
-
   /* signals */
   void (* mute_toggled)   (GstMixer      *mixer,
                            GstMixerTrack *channel,
@@ -95,6 +89,13 @@ struct _GstMixerClass {
                            GstMixerOptions *opts,
                            const gchar   *option);
 
+  /* FIXME 0.11: move set/get function to virtual functions part */
+  void          (* set_option)     (GstMixer      *mixer,
+                                    GstMixerOptions *opts,
+                                    gchar         *value);
+  const gchar * (* get_option)     (GstMixer      *mixer,
+                                    GstMixerOptions *opts);
+
   /*< private >*/
   gpointer _gst_reserved[GST_PADDING];
 };
@@ -128,6 +129,7 @@ void            gst_mixer_mute_toggled   (GstMixer      *mixer,
 void            gst_mixer_record_toggled (GstMixer      *mixer,
                                           GstMixerTrack *track,
                                           gboolean       record);
+
 void            gst_mixer_volume_changed (GstMixer      *mixer,
                                           GstMixerTrack *track,
                                           const gint    *volumes);