mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiomixer: Use G_DECLARE_FINAL_TYPE

Browse source
This commit is contained in:
Niels De Graef 2020-03-12 07:46:47 +01:00 committed by GStreamer Merge Bot
parent a42f4be0eb
commit 1b683d5a76
2 changed files with 12 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gst/audiomixer/gstaudiointerleave.h
View file

@ -31,18 +31,9 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_AUDIO_INTERLEAVE (gst_audio_interleave_get_type()) #define GST_TYPE_AUDIO_INTERLEAVE (gst_audio_interleave_get_type())
#define GST_AUDIO_INTERLEAVE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_INTERLEAVE,GstAudioInterleave)) G_DECLARE_FINAL_TYPE (GstAudioInterleave, gst_audio_interleave,
#define GST_IS_AUDIO_INTERLEAVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_INTERLEAVE)) GST, AUDIO_INTERLEAVE, GstAudioAggregator)
#define GST_AUDIO_INTERLEAVE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass) ,GST_TYPE_AUDIO_INTERLEAVE,GstAudioInterleaveClass))
#define GST_IS_AUDIO_INTERLEAVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) ,GST_TYPE_AUDIO_INTERLEAVE))
#define GST_AUDIO_INTERLEAVE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj) ,GST_TYPE_AUDIO_INTERLEAVE,GstAudioInterleaveClass))
typedef struct _GstAudioInterleave GstAudioInterleave;
typedef struct _GstAudioInterleaveClass GstAudioInterleaveClass;
typedef struct _GstAudioInterleavePad GstAudioInterleavePad;
typedef struct _GstAudioInterleavePadClass GstAudioInterleavePadClass;
typedef void (*GstInterleaveFunc) (gpointer out, gpointer in, guint stride, typedef void (*GstInterleaveFunc) (gpointer out, gpointer in, guint stride,
guint nframes); guint nframes);
@ -69,18 +60,10 @@ struct _GstAudioInterleave {
GstInterleaveFunc func; GstInterleaveFunc func;
}; };
struct _GstAudioInterleaveClass {
GstAudioAggregatorClass parent_class;
};
GType gst_audio_interleave_get_type (void); #define GST_TYPE_AUDIO_INTERLEAVE_PAD (gst_audio_interleave_pad_get_type())
G_DECLARE_FINAL_TYPE (GstAudioInterleavePad, gst_audio_interleave_pad,
#define GST_TYPE_AUDIO_INTERLEAVE_PAD (gst_audio_interleave_pad_get_type()) GST, AUDIO_INTERLEAVE_PAD, GstAudioAggregatorConvertPad)
#define GST_AUDIO_INTERLEAVE_PAD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_INTERLEAVE_PAD,GstAudioInterleavePad))
#define GST_IS_AUDIO_INTERLEAVE_PAD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_INTERLEAVE_PAD))
#define GST_AUDIO_INTERLEAVE_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass) ,GST_TYPE_AUDIO_INTERLEAVE_PAD,GstAudioInterleavePadClass))
#define GST_IS_AUDIO_INTERLEAVE_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) ,GST_TYPE_AUDIO_INTERLEAVE_PAD))
#define GST_AUDIO_INTERLEAVE_PAD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj) ,GST_TYPE_AUDIO_INTERLEAVE_PAD,GstAudioInterleavePadClass))
struct _GstAudioInterleavePad { struct _GstAudioInterleavePad {
GstAudioAggregatorPad parent; GstAudioAggregatorPad parent;
@ -88,13 +71,6 @@ struct _GstAudioInterleavePad {
guint channel; guint channel;
}; };
struct _GstAudioInterleavePadClass {
GstAudioAggregatorPadClass parent_class;
};
GType gst_audio_interleave_pad_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_AUDIO_INTERLEAVE_H__ */ #endif /* __GST_AUDIO_INTERLEAVE_H__ */

37
gst/audiomixer/gstaudiomixer.h
View file

@ -30,18 +30,9 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_AUDIO_MIXER (gst_audiomixer_get_type()) #define GST_TYPE_AUDIO_MIXER (gst_audiomixer_get_type())
#define GST_AUDIO_MIXER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_MIXER,GstAudioMixer)) G_DECLARE_FINAL_TYPE (GstAudioMixer, gst_audiomixer, GST, AUDIO_MIXER,
#define GST_IS_AUDIO_MIXER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_MIXER)) GstAudioAggregator)
#define GST_AUDIO_MIXER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass) ,GST_TYPE_AUDIO_MIXER,GstAudioMixerClass))
#define GST_IS_AUDIO_MIXER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) ,GST_TYPE_AUDIO_MIXER))
#define GST_AUDIO_MIXER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj) ,GST_TYPE_AUDIO_MIXER,GstAudioMixerClass))
typedef struct _GstAudioMixer GstAudioMixer;
typedef struct _GstAudioMixerClass GstAudioMixerClass;
typedef struct _GstAudioMixerPad GstAudioMixerPad;
typedef struct _GstAudioMixerPadClass GstAudioMixerPadClass;
/** /**
* GstAudioMixer: * GstAudioMixer:
@ -52,18 +43,9 @@ struct _GstAudioMixer {
GstAudioAggregator element; GstAudioAggregator element;
}; };
struct _GstAudioMixerClass { #define GST_TYPE_AUDIO_MIXER_PAD (gst_audiomixer_pad_get_type())
GstAudioAggregatorClass parent_class; G_DECLARE_FINAL_TYPE (GstAudioMixerPad, gst_audiomixer_pad,
}; GST, AUDIO_MIXER_PAD, GstAudioAggregatorConvertPad)
GType gst_audiomixer_get_type (void);
#define GST_TYPE_AUDIO_MIXER_PAD (gst_audiomixer_pad_get_type())
#define GST_AUDIO_MIXER_PAD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_MIXER_PAD,GstAudioMixerPad))
#define GST_IS_AUDIO_MIXER_PAD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_MIXER_PAD))
#define GST_AUDIO_MIXER_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass) ,GST_TYPE_AUDIO_MIXER_PAD,GstAudioMixerPadClass))
#define GST_IS_AUDIO_MIXER_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) ,GST_TYPE_AUDIO_MIXER_PAD))
#define GST_AUDIO_MIXER_PAD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj) ,GST_TYPE_AUDIO_MIXER_PAD,GstAudioMixerPadClass))
struct _GstAudioMixerPad { struct _GstAudioMixerPad {
GstAudioAggregatorConvertPad parent; GstAudioAggregatorConvertPad parent;
@ -75,13 +57,6 @@ struct _GstAudioMixerPad {
gboolean mute; gboolean mute;
}; };
struct _GstAudioMixerPadClass {
GstAudioAggregatorConvertPadClass parent_class;
};
GType gst_audiomixer_pad_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_AUDIO_MIXER_H__ */ #endif /* __GST_AUDIO_MIXER_H__ */