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).
This commit is contained in:
Marc-Andre Lureau 2007-05-18 15:10:08 +00:00 committed by Stefan Kost
parent cbc95dfb3d
commit 16b8bd4c49
2 changed files with 17 additions and 7 deletions

View file

@ -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> 2007-05-17 Jan Schmidt <thaytan@mad.scientist.com>
* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_put), * sys/ximage/ximagesink.c: (gst_ximagesink_ximage_put),

View file

@ -57,7 +57,7 @@ struct _GstMixerClass {
GTypeInterface klass; GTypeInterface klass;
GstMixerType mixer_type; GstMixerType mixer_type;
/* virtual functions */ /* virtual functions */
const GList * (* list_tracks) (GstMixer *mixer); const GList * (* list_tracks) (GstMixer *mixer);
@ -74,12 +74,6 @@ struct _GstMixerClass {
void (* set_record) (GstMixer *mixer, void (* set_record) (GstMixer *mixer,
GstMixerTrack *track, GstMixerTrack *track,
gboolean record); gboolean record);
void (* set_option) (GstMixer *mixer,
GstMixerOptions *opts,
gchar *value);
const gchar * (* get_option) (GstMixer *mixer,
GstMixerOptions *opts);
/* signals */ /* signals */
void (* mute_toggled) (GstMixer *mixer, void (* mute_toggled) (GstMixer *mixer,
GstMixerTrack *channel, GstMixerTrack *channel,
@ -95,6 +89,13 @@ struct _GstMixerClass {
GstMixerOptions *opts, GstMixerOptions *opts,
const gchar *option); 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 >*/ /*< private >*/
gpointer _gst_reserved[GST_PADDING]; gpointer _gst_reserved[GST_PADDING];
}; };
@ -128,6 +129,7 @@ void gst_mixer_mute_toggled (GstMixer *mixer,
void gst_mixer_record_toggled (GstMixer *mixer, void gst_mixer_record_toggled (GstMixer *mixer,
GstMixerTrack *track, GstMixerTrack *track,
gboolean record); gboolean record);
void gst_mixer_volume_changed (GstMixer *mixer, void gst_mixer_volume_changed (GstMixer *mixer,
GstMixerTrack *track, GstMixerTrack *track,
const gint *volumes); const gint *volumes);