Merge branch 'master' into 0.11

[platform/upstream/gst-plugins-base.git] / gst-libs / gst / audio / mixer.h

diff --git a/gst-libs/gst/interfaces/mixer.h b/gst-libs/gst/audio/mixer.h
similarity index 82%
rename from gst-libs/gst/interfaces/mixer.h
rename to gst-libs/gst/audio/mixer.h
index 491c14c..1de602d 100644 (file)
--- a/gst-libs/gst/interfaces/mixer.h
+++ b/gst-libs/gst/audio/mixer.h
@@ -23,29 +23,22 @@
 #define __GST_MIXER_H__
 
 #include <gst/gst.h>
-#include <gst/interfaces/mixeroptions.h>
-#include <gst/interfaces/mixertrack.h>
-#include <gst/interfaces/interfaces-enumtypes.h>
+#include <gst/audio/mixeroptions.h>
+#include <gst/audio/mixertrack.h>
 
 G_BEGIN_DECLS
 
 #define GST_TYPE_MIXER \
   (gst_mixer_get_type ())
 #define GST_MIXER(obj) \
-  (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MIXER, GstMixer))
-#define GST_MIXER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_MIXER, GstMixerClass))
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MIXER, GstMixer))
 #define GST_IS_MIXER(obj) \
-  (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MIXER))
-#define GST_IS_MIXER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MIXER))
-#define GST_MIXER_GET_CLASS(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_MIXER, GstMixerClass))
-
-#define GST_MIXER_TYPE(klass) (klass->mixer_type)
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MIXER))
+#define GST_MIXER_GET_INTERFACE(inst) \
+  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_MIXER, GstMixerInterface))
 
 typedef struct _GstMixer GstMixer;
-typedef struct _GstMixerClass GstMixerClass;
+typedef struct _GstMixerInterface GstMixerInterface;
 
 /**
  * GstMixerType:
@@ -114,13 +107,8 @@ typedef enum
   GST_MIXER_FLAG_GROUPING            = (1<<2),
 } GstMixerFlags;
 
-struct _GstMixerClass {
-  GTypeInterface klass;
-
-/* FIXME 0.11: Remove this */
-#ifndef GST_REMOVE_DEPRECATED
-  GstMixerType mixer_type;
-#endif
+struct _GstMixerInterface {
+  GTypeInterface iface;
 
   /* virtual functions */
   const GList *  (* list_tracks)   (GstMixer      *mixer);
@@ -138,41 +126,15 @@ struct _GstMixerClass {
   void           (* set_record)    (GstMixer      *mixer,
                                     GstMixerTrack *track,
                                     gboolean       record);
-#ifndef GST_DISABLE_DEPRECATED
-  /* signals (deprecated) */
-  void (* mute_toggled)   (GstMixer      *mixer,
-                           GstMixerTrack *channel,
-                           gboolean       mute);
-  void (* record_toggled) (GstMixer      *mixer,
-                           GstMixerTrack *channel,
-                           gboolean       record);
-  void (* volume_changed) (GstMixer      *mixer,
-                           GstMixerTrack *channel,
-                           gint          *volumes);
-#else
-  gpointer padding1[3];
-#endif /* not GST_DISABLE_DEPRECATED */
-
-  void          (* set_option)     (GstMixer      *mixer,
+  void           (* set_option)    (GstMixer      *mixer,
                                     GstMixerOptions *opts,
                                     gchar         *value);
-  const gchar * (* get_option)     (GstMixer      *mixer,
+  const gchar *  (* get_option)    (GstMixer      *mixer,
                                     GstMixerOptions *opts);
 
-#ifndef GST_DISABLE_DEPRECATED
-  void (* option_changed) (GstMixer      *mixer,
-                           GstMixerOptions *opts,
-                           gchar   *option);
-#else
-  gpointer padding2;
-#endif /* not GST_DISABLE_DEPRECATED */
-
   GstMixerFlags (* get_mixer_flags) (GstMixer *mixer);
 
   GstMixerType  (* get_mixer_type)  (GstMixer *mixer);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING-2];
 };
 
 GType           gst_mixer_get_type      (void);