diff -r 9b2c3c7a1a9c -r 567bb019e3e3 gst_plugins_base/gst-libs/gst/interfaces/mixer.c --- a/gst_plugins_base/gst-libs/gst/interfaces/mixer.c Wed Mar 31 22:03:18 2010 +0300 +++ b/gst_plugins_base/gst-libs/gst/interfaces/mixer.c Tue Aug 31 15:30:33 2010 +0300 @@ -143,6 +143,8 @@ * it is allowed to only provide input elements in this list. * * Returns: A #GList consisting of zero or more #GstMixerTracks. + * The list is owned by the #GstMixer instance and must not be freed + * or modified. */ #ifdef __SYMBIAN32__ EXPORT_C @@ -354,6 +356,28 @@ } /** + * gst_mixer_get_mixer_type: + * @mixer: The #GstMixer implementation + * + * Get the #GstMixerType of this mixer implementation. + * + * Returns: A the #GstMixerType. + * + * Since: 0.10.24 + */ +#ifdef __SYMBIAN32__ +EXPORT_C +#endif + +GstMixerType +gst_mixer_get_mixer_type (GstMixer * mixer) +{ + GstMixerClass *klass = GST_MIXER_GET_CLASS (mixer); + + return klass->mixer_type; +} + +/** * gst_mixer_get_mixer_flags: * @mixer: The #GstMixer implementation * @@ -655,7 +679,7 @@ * message and return the GstMixerMessageType identifying which * type of notification it is. * - * Returns: The type of the GstMixerMessage, or GST_MIXER_MESSAGE_NONE + * Returns: The type of the GstMixerMessage, or GST_MIXER_MESSAGE_INVALID * if the message is not a GstMixer notification. * * Since: 0.10.14