mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 17:52:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

interfaces: clean up the use of iface and class/klass

Browse source
This commit is contained in:
Stefan Sauer 2011-10-21 14:37:31 +02:00
parent a586547b0c
commit 53d7d2e966
29 changed files with 242 additions and 258 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
docs/libs/gst-plugins-base-libs-sections.txt
View file

@ -571,7 +571,7 @@ KISS_FFT_F64_SIN
<FILE>gstcolorbalance</FILE> <FILE>gstcolorbalance</FILE>
<INCLUDE>gst/interfaces/color.h</INCLUDE> <INCLUDE>gst/interfaces/color.h</INCLUDE>
GstColorBalance GstColorBalance
GstColorBalanceClass GstColorBalanceInterface
GstColorBalanceType GstColorBalanceType
gst_color_balance_list_channels gst_color_balance_list_channels
gst_color_balance_get_value gst_color_balance_get_value
@ -580,11 +580,9 @@ gst_color_balance_value_changed
gst_color_balance_get_balance_type gst_color_balance_get_balance_type
<SUBSECTION Standard> <SUBSECTION Standard>
GST_COLOR_BALANCE GST_COLOR_BALANCE
GST_COLOR_BALANCE_CLASS GST_COLOR_BALANCE_GET_INTERACE
GST_COLOR_BALANCE_GET_CLASS
GST_COLOR_BALANCE_TYPE GST_COLOR_BALANCE_TYPE
GST_IS_COLOR_BALANCE GST_IS_COLOR_BALANCE
GST_IS_COLOR_BALANCE_CLASS
GST_TYPE_COLOR_BALANCE GST_TYPE_COLOR_BALANCE
GST_TYPE_COLOR_BALANCE_TYPE GST_TYPE_COLOR_BALANCE_TYPE
gst_color_balance_get_type gst_color_balance_get_type
@ -647,11 +645,9 @@ GST_TYPE_MIXER_TYPE
GST_TYPE_MIXER_FLAGS GST_TYPE_MIXER_FLAGS
GST_TYPE_MIXER_MESSAGE_TYPE GST_TYPE_MIXER_MESSAGE_TYPE
GST_MIXER GST_MIXER
GST_MIXER_CLASS GST_MIXER_GET_INTERFACE
GST_MIXER_GET_CLASS
GST_MIXER_TYPE GST_MIXER_TYPE
GST_IS_MIXER GST_IS_MIXER
GST_IS_MIXER_CLASS
GST_TYPE_STREAM_VOLUME_FORMAT GST_TYPE_STREAM_VOLUME_FORMAT
gst_mixer_get_type gst_mixer_get_type
gst_mixer_type_get_type gst_mixer_type_get_type
@ -740,7 +736,7 @@ GST_NAVIGATION_COMMAND_DVD_TITLE_MENU
<SUBSECTION Standard> <SUBSECTION Standard>
GST_TYPE_NAVIGATION GST_TYPE_NAVIGATION
GST_NAVIGATION GST_NAVIGATION
GST_NAVIGATION_GET_IFACE GST_NAVIGATION_GET_INTERFACE
GST_TYPE_NAVIGATION_COMMAND GST_TYPE_NAVIGATION_COMMAND
GST_TYPE_NAVIGATION_EVENT_TYPE GST_TYPE_NAVIGATION_EVENT_TYPE
GST_TYPE_NAVIGATION_MESSAGE_TYPE GST_TYPE_NAVIGATION_MESSAGE_TYPE
@ -773,7 +769,7 @@ gst_property_probe_probe_property_name
<SUBSECTION Standard> <SUBSECTION Standard>
GST_TYPE_PROPERTY_PROBE GST_TYPE_PROPERTY_PROBE
GST_PROPERTY_PROBE GST_PROPERTY_PROBE
GST_PROPERTY_PROBE_GET_IFACE GST_PROPERTY_PROBE_GET_INTEFACE
GST_IS_PROPERTY_PROBE GST_IS_PROPERTY_PROBE
gst_property_probe_get_type gst_property_probe_get_type
</SECTION> </SECTION>
@ -807,7 +803,7 @@ gst_stream_volume_get_type
<FILE>gsttuner</FILE> <FILE>gsttuner</FILE>
<INCLUDE>gst/interfaces/tuner.h</INCLUDE> <INCLUDE>gst/interfaces/tuner.h</INCLUDE>
GstTuner GstTuner
GstTunerClass GstTunerInterface
gst_tuner_list_channels gst_tuner_list_channels
gst_tuner_get_channel gst_tuner_get_channel
@ -831,10 +827,8 @@ gst_tuner_signal_changed
<SUBSECTION Standard> <SUBSECTION Standard>
GST_TYPE_TUNER GST_TYPE_TUNER
GST_TUNER GST_TUNER
GST_TUNER_CLASS GST_TUNER_GET_INTERFACE
GST_TUNER_GET_CLASS
GST_IS_TUNER GST_IS_TUNER
GST_IS_TUNER_CLASS
gst_tuner_get_type gst_tuner_get_type
</SECTION> </SECTION>
@ -887,7 +881,7 @@ gst_video_orientation_set_vflip
GST_TYPE_VIDEO_ORIENTATION GST_TYPE_VIDEO_ORIENTATION
GST_VIDEO_ORIENTATION GST_VIDEO_ORIENTATION
GST_IS_VIDEO_ORIENTATION GST_IS_VIDEO_ORIENTATION
GST_VIDEO_ORIENTATION_GET_IFACE GST_VIDEO_ORIENTATION_GET_INTERFACE
gst_video_orientation_get_type gst_video_orientation_get_type
</SECTION> </SECTION>
@ -906,7 +900,7 @@ gst_video_overlay_set_render_rectangle
GST_TYPE_VIDEO_OVERLAY GST_TYPE_VIDEO_OVERLAY
GST_VIDEO_OVERLAY GST_VIDEO_OVERLAY
GST_IS_VIDEO_OVERLAY GST_IS_VIDEO_OVERLAY
GST_VIDEO_OVERLAY_GET_IFACE GST_VIDEO_OVERLAY_GET_INTERFACE
gst_video_overlay_get_type gst_video_overlay_get_type
</SECTION> </SECTION>
@ -1619,7 +1613,7 @@ GstRTSPExtensionInterface
<SUBSECTION Standard> <SUBSECTION Standard>
GST_IS_RTSP_EXTENSION GST_IS_RTSP_EXTENSION
GST_RTSP_EXTENSION GST_RTSP_EXTENSION
GST_RTSP_EXTENSION_GET_IFACE GST_RTSP_EXTENSION_GET_INTERFACE
GST_TYPE_RTSP_EXTENSION GST_TYPE_RTSP_EXTENSION
gst_rtsp_extension_after_send gst_rtsp_extension_after_send
gst_rtsp_extension_before_send gst_rtsp_extension_before_send

20
ext/alsa/gstalsamixer.h
View file

@ -187,19 +187,19 @@ interface_as_function ## _get_mixer_flags (GstMixer * mixer)
} \ } \
\ \
static void \ static void \
interface_as_function ## _interface_init (GstMixerClass * klass) \ interface_as_function ## _interface_init (GstMixerInterface * iface) \
{ \ { \
GST_MIXER_TYPE (klass) = GST_MIXER_HARDWARE; \ GST_MIXER_TYPE (iface) = GST_MIXER_HARDWARE; \
\ \
/* set up the interface hooks */ \ /* set up the interface hooks */ \
klass->list_tracks = interface_as_function ## _list_tracks; \ iface->list_tracks = interface_as_function ## _list_tracks; \
klass->set_volume = interface_as_function ## _set_volume; \ iface->set_volume = interface_as_function ## _set_volume; \
klass->get_volume = interface_as_function ## _get_volume; \ iface->get_volume = interface_as_function ## _get_volume; \
klass->set_mute = interface_as_function ## _set_mute; \ iface->set_mute = interface_as_function ## _set_mute; \
klass->set_record = interface_as_function ## _set_record; \ iface->set_record = interface_as_function ## _set_record; \
klass->set_option = interface_as_function ## _set_option; \ iface->set_option = interface_as_function ## _set_option; \
klass->get_option = interface_as_function ## _get_option; \ iface->get_option = interface_as_function ## _get_option; \
klass->get_mixer_flags = interface_as_function ## _get_mixer_flags; \ iface->get_mixer_flags = interface_as_function ## _get_mixer_flags; \
} }

18
gst-libs/gst/audio/gstaudioprocess.c
View file

@ -96,7 +96,7 @@ gst_rtsp_extension_detect_server (GstRTSPExtension * ext, GstRTSPMessage * resp)
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
gboolean res = TRUE; gboolean res = TRUE;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->detect_server) if (iface->detect_server)
res = iface->detect_server (ext, resp); res = iface->detect_server (ext, resp);
@ -109,7 +109,7 @@ gst_rtsp_extension_before_send (GstRTSPExtension * ext, GstRTSPMessage * req)
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->before_send) if (iface->before_send)
res = iface->before_send (ext, req); res = iface->before_send (ext, req);
@ -123,7 +123,7 @@ gst_rtsp_extension_after_send (GstRTSPExtension * ext, GstRTSPMessage * req,
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->after_send) if (iface->after_send)
res = iface->after_send (ext, req, resp); res = iface->after_send (ext, req, resp);
@ -137,7 +137,7 @@ gst_rtsp_extension_parse_sdp (GstRTSPExtension * ext, GstSDPMessage * sdp,
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->parse_sdp) if (iface->parse_sdp)
res = iface->parse_sdp (ext, sdp, s); res = iface->parse_sdp (ext, sdp, s);
@ -150,7 +150,7 @@ gst_rtsp_extension_setup_media (GstRTSPExtension * ext, GstSDPMedia * media)
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->setup_media) if (iface->setup_media)
res = iface->setup_media (ext, media); res = iface->setup_media (ext, media);
@ -163,7 +163,7 @@ gst_rtsp_extension_configure_stream (GstRTSPExtension * ext, GstCaps * caps)
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
gboolean res = TRUE; gboolean res = TRUE;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->configure_stream) if (iface->configure_stream)
res = iface->configure_stream (ext, caps); res = iface->configure_stream (ext, caps);
@ -177,7 +177,7 @@ gst_rtsp_extension_get_transports (GstRTSPExtension * ext,
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->get_transports) if (iface->get_transports)
res = iface->get_transports (ext, protocols, transport); res = iface->get_transports (ext, protocols, transport);
@ -190,7 +190,7 @@ gst_rtsp_extension_stream_select (GstRTSPExtension * ext, GstRTSPUrl * url)
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->stream_select) if (iface->stream_select)
res = iface->stream_select (ext, url); res = iface->stream_select (ext, url);
@ -204,7 +204,7 @@ gst_rtsp_extension_receive_request (GstRTSPExtension * ext,
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_ENOTIMPL; GstRTSPResult res = GST_RTSP_ENOTIMPL;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->receive_request) if (iface->receive_request)
res = iface->receive_request (ext, msg); res = iface->receive_request (ext, msg);

2
gst-libs/gst/audio/gstaudioprocess.h
View file

@ -32,7 +32,7 @@ G_BEGIN_DECLS
(GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_AUDIO_PROCESS, GstAudioProcess)) (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_AUDIO_PROCESS, GstAudioProcess))
#define GST_IS_AUDIO_PROCESS(obj) \ #define GST_IS_AUDIO_PROCESS(obj) \
(GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_AUDIO_PROCESS)) (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_AUDIO_PROCESS))
#define GST_AUDIO_PROCESS_GET_IFACE(inst) \ #define GST_AUDIO_PROCESS_GET_INTERFACE(inst) \
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_AUDIO_PROCESS, GstAudioProcessInterface)) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_AUDIO_PROCESS, GstAudioProcessInterface))
typedef struct _GstAudioProcess GstAudioProcess; typedef struct _GstAudioProcess GstAudioProcess;

44
gst-libs/gst/interfaces/colorbalance.c
View file

@ -52,7 +52,7 @@ enum
LAST_SIGNAL LAST_SIGNAL
}; };
static void gst_color_balance_class_init (GstColorBalanceClass * klass); static void gst_color_balance_class_init (GstColorBalanceInterface * iface);
static guint gst_color_balance_signals[LAST_SIGNAL] = { 0 }; static guint gst_color_balance_signals[LAST_SIGNAL] = { 0 };
@ -63,7 +63,7 @@ gst_color_balance_get_type (void)
if (!gst_color_balance_type) { if (!gst_color_balance_type) {
static const GTypeInfo gst_color_balance_info = { static const GTypeInfo gst_color_balance_info = {
sizeof (GstColorBalanceClass), sizeof (GstColorBalanceInterface),
(GBaseInitFunc) gst_color_balance_class_init, (GBaseInitFunc) gst_color_balance_class_init,
NULL, NULL,
NULL, NULL,
@ -82,7 +82,7 @@ gst_color_balance_get_type (void)
} }
static void static void
gst_color_balance_class_init (GstColorBalanceClass * klass) gst_color_balance_class_init (GstColorBalanceInterface * iface)
{ {
static gboolean initialized = FALSE; static gboolean initialized = FALSE;
@ -98,7 +98,7 @@ gst_color_balance_class_init (GstColorBalanceClass * klass)
gst_color_balance_signals[VALUE_CHANGED] = gst_color_balance_signals[VALUE_CHANGED] =
g_signal_new ("value-changed", g_signal_new ("value-changed",
GST_TYPE_COLOR_BALANCE, G_SIGNAL_RUN_LAST, GST_TYPE_COLOR_BALANCE, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstColorBalanceClass, value_changed), G_STRUCT_OFFSET (GstColorBalanceInterface, value_changed),
NULL, NULL, NULL, NULL,
gst_interfaces_marshal_VOID__OBJECT_INT, gst_interfaces_marshal_VOID__OBJECT_INT,
G_TYPE_NONE, 2, GST_TYPE_COLOR_BALANCE_CHANNEL, G_TYPE_INT); G_TYPE_NONE, 2, GST_TYPE_COLOR_BALANCE_CHANNEL, G_TYPE_INT);
@ -106,12 +106,12 @@ gst_color_balance_class_init (GstColorBalanceClass * klass)
initialized = TRUE; initialized = TRUE;
} }
klass->balance_type = GST_COLOR_BALANCE_SOFTWARE; iface->balance_type = GST_COLOR_BALANCE_SOFTWARE;
/* default virtual functions */ /* default virtual functions */
klass->list_channels = NULL; iface->list_channels = NULL;
klass->set_value = NULL; iface->set_value = NULL;
klass->get_value = NULL; iface->get_value = NULL;
} }
/** /**
@ -127,14 +127,14 @@ gst_color_balance_class_init (GstColorBalanceClass * klass)
const GList * const GList *
gst_color_balance_list_channels (GstColorBalance * balance) gst_color_balance_list_channels (GstColorBalance * balance)
{ {
GstColorBalanceClass *klass; GstColorBalanceInterface *iface;
g_return_val_if_fail (GST_IS_COLOR_BALANCE (balance), NULL); g_return_val_if_fail (GST_IS_COLOR_BALANCE (balance), NULL);
klass = GST_COLOR_BALANCE_GET_CLASS (balance); iface = GST_COLOR_BALANCE_GET_INTERFACE (balance);
if (klass->list_channels) { if (iface->list_channels) {
return klass->list_channels (balance); return iface->list_channels (balance);
} }
return NULL; return NULL;
@ -157,10 +157,10 @@ void
gst_color_balance_set_value (GstColorBalance * balance, gst_color_balance_set_value (GstColorBalance * balance,
GstColorBalanceChannel * channel, gint value) GstColorBalanceChannel * channel, gint value)
{ {
GstColorBalanceClass *klass = GST_COLOR_BALANCE_GET_CLASS (balance); GstColorBalanceInterface *iface = GST_COLOR_BALANCE_GET_INTERFACE (balance);
if (klass->set_value) { if (iface->set_value) {
klass->set_value (balance, channel, value); iface->set_value (balance, channel, value);
} }
} }
@ -182,14 +182,14 @@ gint
gst_color_balance_get_value (GstColorBalance * balance, gst_color_balance_get_value (GstColorBalance * balance,
GstColorBalanceChannel * channel) GstColorBalanceChannel * channel)
{ {
GstColorBalanceClass *klass; GstColorBalanceInterface *iface;
g_return_val_if_fail (GST_IS_COLOR_BALANCE (balance), 0); g_return_val_if_fail (GST_IS_COLOR_BALANCE (balance), 0);
klass = GST_COLOR_BALANCE_GET_CLASS (balance); iface = GST_COLOR_BALANCE_GET_INTERFACE (balance);
if (klass->get_value) { if (iface->get_value) {
return klass->get_value (balance, channel); return iface->get_value (balance, channel);
} }
return channel->min_value; return channel->min_value;
@ -208,14 +208,14 @@ gst_color_balance_get_value (GstColorBalance * balance,
GstColorBalanceType GstColorBalanceType
gst_color_balance_get_balance_type (GstColorBalance * balance) gst_color_balance_get_balance_type (GstColorBalance * balance)
{ {
GstColorBalanceClass *klass; GstColorBalanceInterface *iface;
g_return_val_if_fail (GST_IS_COLOR_BALANCE (balance), g_return_val_if_fail (GST_IS_COLOR_BALANCE (balance),
GST_COLOR_BALANCE_SOFTWARE); GST_COLOR_BALANCE_SOFTWARE);
klass = GST_COLOR_BALANCE_GET_CLASS (balance); iface = GST_COLOR_BALANCE_GET_INTERFACE (balance);
return klass->balance_type; return iface->balance_type;
} }
/** /**

15
gst-libs/gst/interfaces/colorbalance.h
View file

@ -33,20 +33,15 @@ G_BEGIN_DECLS
(gst_color_balance_get_type ()) (gst_color_balance_get_type ())
#define GST_COLOR_BALANCE(obj) \ #define GST_COLOR_BALANCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE, GstColorBalance)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE, GstColorBalance))
#define GST_COLOR_BALANCE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_COLOR_BALANCE, \
GstColorBalanceClass))
#define GST_IS_COLOR_BALANCE(obj) \ #define GST_IS_COLOR_BALANCE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_COLOR_BALANCE)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_COLOR_BALANCE))
#define GST_IS_COLOR_BALANCE_CLASS(klass) \ #define GST_COLOR_BALANCE_GET_INTERFACE(inst) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE)) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_COLOR_BALANCE, GstColorBalanceInterface))
#define GST_COLOR_BALANCE_GET_CLASS(inst) \
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_COLOR_BALANCE, GstColorBalanceClass))
#define GST_COLOR_BALANCE_TYPE(klass) (klass->balance_type) #define GST_COLOR_BALANCE_TYPE(klass) (klass->balance_type)
typedef struct _GstColorBalance GstColorBalance; typedef struct _GstColorBalance GstColorBalance;
typedef struct _GstColorBalanceClass GstColorBalanceClass; typedef struct _GstColorBalanceInterface GstColorBalanceInterface;
/** /**
* GstColorBalanceType: * GstColorBalanceType:
@ -67,7 +62,7 @@ typedef enum
} GstColorBalanceType; } GstColorBalanceType;
/** /**
* GstColorBalanceClass: * GstColorBalanceInterface:
* @klass: the parent interface * @klass: the parent interface
* @balance_type: implementation type * @balance_type: implementation type
* @list_channels: list handled channels * @list_channels: list handled channels
@ -77,7 +72,7 @@ typedef enum
* *
* Color-balance interface. * Color-balance interface.
*/ */
struct _GstColorBalanceClass { struct _GstColorBalanceInterface {
GTypeInterface klass; GTypeInterface klass;
GstColorBalanceType balance_type; GstColorBalanceType balance_type;

96
gst-libs/gst/interfaces/mixer.c
View file

@ -67,7 +67,7 @@ static guint gst_mixer_signals[LAST_SIGNAL] = { 0 };
#endif #endif
static void gst_mixer_class_init (GstMixerClass * klass); static void gst_mixer_class_init (GstMixerInterface * iface);
GType GType
gst_mixer_get_type (void) gst_mixer_get_type (void)
@ -76,7 +76,7 @@ gst_mixer_get_type (void)
if (!gst_mixer_type) { if (!gst_mixer_type) {
static const GTypeInfo gst_mixer_info = { static const GTypeInfo gst_mixer_info = {
sizeof (GstMixerClass), sizeof (GstMixerInterface),
(GBaseInitFunc) gst_mixer_class_init, (GBaseInitFunc) gst_mixer_class_init,
NULL, NULL,
NULL, NULL,
@ -95,7 +95,7 @@ gst_mixer_get_type (void)
} }
static void static void
gst_mixer_class_init (GstMixerClass * klass) gst_mixer_class_init (GstMixerInterface * iface)
{ {
#ifndef GST_DISABLE_DEPRECATED #ifndef GST_DISABLE_DEPRECATED
static gboolean initialized = FALSE; static gboolean initialized = FALSE;
@ -105,28 +105,28 @@ gst_mixer_class_init (GstMixerClass * klass)
gst_mixer_signals[SIGNAL_RECORD_TOGGLED] = gst_mixer_signals[SIGNAL_RECORD_TOGGLED] =
g_signal_new ("record-toggled", g_signal_new ("record-toggled",
GST_TYPE_MIXER, G_SIGNAL_RUN_LAST, GST_TYPE_MIXER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstMixerClass, record_toggled), G_STRUCT_OFFSET (GstMixerInterface, record_toggled),
NULL, NULL, NULL, NULL,
gst_interfaces_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, gst_interfaces_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2,
GST_TYPE_MIXER_TRACK, G_TYPE_BOOLEAN); GST_TYPE_MIXER_TRACK, G_TYPE_BOOLEAN);
gst_mixer_signals[SIGNAL_MUTE_TOGGLED] = gst_mixer_signals[SIGNAL_MUTE_TOGGLED] =
g_signal_new ("mute-toggled", g_signal_new ("mute-toggled",
GST_TYPE_MIXER, G_SIGNAL_RUN_LAST, GST_TYPE_MIXER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstMixerClass, mute_toggled), G_STRUCT_OFFSET (GstMixerInterface, mute_toggled),
NULL, NULL, NULL, NULL,
gst_interfaces_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, gst_interfaces_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2,
GST_TYPE_MIXER_TRACK, G_TYPE_BOOLEAN); GST_TYPE_MIXER_TRACK, G_TYPE_BOOLEAN);
gst_mixer_signals[SIGNAL_VOLUME_CHANGED] = gst_mixer_signals[SIGNAL_VOLUME_CHANGED] =
g_signal_new ("volume-changed", g_signal_new ("volume-changed",
GST_TYPE_MIXER, G_SIGNAL_RUN_LAST, GST_TYPE_MIXER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstMixerClass, volume_changed), G_STRUCT_OFFSET (GstMixerInterface, volume_changed),
NULL, NULL, NULL, NULL,
gst_interfaces_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 2, gst_interfaces_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 2,
GST_TYPE_MIXER_TRACK, G_TYPE_POINTER); GST_TYPE_MIXER_TRACK, G_TYPE_POINTER);
gst_mixer_signals[SIGNAL_OPTION_CHANGED] = gst_mixer_signals[SIGNAL_OPTION_CHANGED] =
g_signal_new ("option-changed", g_signal_new ("option-changed",
GST_TYPE_MIXER, G_SIGNAL_RUN_LAST, GST_TYPE_MIXER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstMixerClass, option_changed), G_STRUCT_OFFSET (GstMixerInterface, option_changed),
NULL, NULL, NULL, NULL,
gst_interfaces_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, gst_interfaces_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2,
GST_TYPE_MIXER_OPTIONS, G_TYPE_STRING); GST_TYPE_MIXER_OPTIONS, G_TYPE_STRING);
@ -135,16 +135,16 @@ gst_mixer_class_init (GstMixerClass * klass)
} }
#endif #endif
klass->mixer_type = GST_MIXER_SOFTWARE; iface->mixer_type = GST_MIXER_SOFTWARE;
/* default virtual functions */ /* default virtual functions */
klass->list_tracks = NULL; iface->list_tracks = NULL;
klass->set_volume = NULL; iface->set_volume = NULL;
klass->get_volume = NULL; iface->get_volume = NULL;
klass->set_mute = NULL; iface->set_mute = NULL;
klass->set_record = NULL; iface->set_record = NULL;
klass->set_option = NULL; iface->set_option = NULL;
klass->get_option = NULL; iface->get_option = NULL;
} }
/** /**
@ -164,14 +164,14 @@ gst_mixer_class_init (GstMixerClass * klass)
const GList * const GList *
gst_mixer_list_tracks (GstMixer * mixer) gst_mixer_list_tracks (GstMixer * mixer)
{ {
GstMixerClass *klass; GstMixerInterface *iface;
g_return_val_if_fail (mixer != NULL, NULL); g_return_val_if_fail (mixer != NULL, NULL);
klass = GST_MIXER_GET_CLASS (mixer); iface = GST_MIXER_GET_INTERFACE (mixer);
if (klass->list_tracks) { if (iface->list_tracks) {
return klass->list_tracks (mixer); return iface->list_tracks (mixer);
} }
return NULL; return NULL;
@ -195,16 +195,16 @@ gst_mixer_list_tracks (GstMixer * mixer)
void void
gst_mixer_set_volume (GstMixer * mixer, GstMixerTrack * track, gint * volumes) gst_mixer_set_volume (GstMixer * mixer, GstMixerTrack * track, gint * volumes)
{ {
GstMixerClass *klass; GstMixerInterface *iface;
g_return_if_fail (mixer != NULL); g_return_if_fail (mixer != NULL);
g_return_if_fail (track != NULL); g_return_if_fail (track != NULL);
g_return_if_fail (volumes != NULL); g_return_if_fail (volumes != NULL);
klass = GST_MIXER_GET_CLASS (mixer); iface = GST_MIXER_GET_INTERFACE (mixer);
if (klass->set_volume) { if (iface->set_volume) {
klass->set_volume (mixer, track, volumes); iface->set_volume (mixer, track, volumes);
} }
} }
@ -222,16 +222,16 @@ gst_mixer_set_volume (GstMixer * mixer, GstMixerTrack * track, gint * volumes)
void void
gst_mixer_get_volume (GstMixer * mixer, GstMixerTrack * track, gint * volumes) gst_mixer_get_volume (GstMixer * mixer, GstMixerTrack * track, gint * volumes)
{ {
GstMixerClass *klass; GstMixerInterface *iface;
g_return_if_fail (mixer != NULL); g_return_if_fail (mixer != NULL);
g_return_if_fail (track != NULL); g_return_if_fail (track != NULL);
g_return_if_fail (volumes != NULL); g_return_if_fail (volumes != NULL);
klass = GST_MIXER_GET_CLASS (mixer); iface = GST_MIXER_GET_INTERFACE (mixer);
if (klass->get_volume) { if (iface->get_volume) {
klass->get_volume (mixer, track, volumes); iface->get_volume (mixer, track, volumes);
} else { } else {
gint i; gint i;
@ -255,15 +255,15 @@ gst_mixer_get_volume (GstMixer * mixer, GstMixerTrack * track, gint * volumes)
void void
gst_mixer_set_mute (GstMixer * mixer, GstMixerTrack * track, gboolean mute) gst_mixer_set_mute (GstMixer * mixer, GstMixerTrack * track, gboolean mute)
{ {
GstMixerClass *klass; GstMixerInterface *iface;
g_return_if_fail (mixer != NULL); g_return_if_fail (mixer != NULL);
g_return_if_fail (track != NULL); g_return_if_fail (track != NULL);
klass = GST_MIXER_GET_CLASS (mixer); iface = GST_MIXER_GET_INTERFACE (mixer);
if (klass->set_mute) { if (iface->set_mute) {
klass->set_mute (mixer, track, mute); iface->set_mute (mixer, track, mute);
} }
} }
@ -283,10 +283,10 @@ gst_mixer_set_mute (GstMixer * mixer, GstMixerTrack * track, gboolean mute)
void void
gst_mixer_set_record (GstMixer * mixer, GstMixerTrack * track, gboolean record) gst_mixer_set_record (GstMixer * mixer, GstMixerTrack * track, gboolean record)
{ {
GstMixerClass *klass = GST_MIXER_GET_CLASS (mixer); GstMixerInterface *iface = GST_MIXER_GET_INTERFACE (mixer);
if (klass->set_record) { if (iface->set_record) {
klass->set_record (mixer, track, record); iface->set_record (mixer, track, record);
} }
} }
@ -302,15 +302,15 @@ gst_mixer_set_record (GstMixer * mixer, GstMixerTrack * track, gboolean record)
void void
gst_mixer_set_option (GstMixer * mixer, GstMixerOptions * opts, gchar * value) gst_mixer_set_option (GstMixer * mixer, GstMixerOptions * opts, gchar * value)
{ {
GstMixerClass *klass; GstMixerInterface *iface;
g_return_if_fail (mixer != NULL); g_return_if_fail (mixer != NULL);
g_return_if_fail (opts != NULL); g_return_if_fail (opts != NULL);
klass = GST_MIXER_GET_CLASS (mixer); iface = GST_MIXER_GET_INTERFACE (mixer);
if (klass->set_option) { if (iface->set_option) {
klass->set_option (mixer, opts, value); iface->set_option (mixer, opts, value);
} }
} }
@ -327,15 +327,15 @@ gst_mixer_set_option (GstMixer * mixer, GstMixerOptions * opts, gchar * value)
const gchar * const gchar *
gst_mixer_get_option (GstMixer * mixer, GstMixerOptions * opts) gst_mixer_get_option (GstMixer * mixer, GstMixerOptions * opts)
{ {
GstMixerClass *klass; GstMixerInterface *iface;
g_return_val_if_fail (mixer != NULL, NULL); g_return_val_if_fail (mixer != NULL, NULL);
g_return_val_if_fail (opts != NULL, NULL); g_return_val_if_fail (opts != NULL, NULL);
klass = GST_MIXER_GET_CLASS (mixer); iface = GST_MIXER_GET_INTERFACE (mixer);
if (klass->get_option) { if (iface->get_option) {
return klass->get_option (mixer, opts); return iface->get_option (mixer, opts);
} }
return NULL; return NULL;
@ -354,9 +354,9 @@ gst_mixer_get_option (GstMixer * mixer, GstMixerOptions * opts)
GstMixerType GstMixerType
gst_mixer_get_mixer_type (GstMixer * mixer) gst_mixer_get_mixer_type (GstMixer * mixer)
{ {
GstMixerClass *klass = GST_MIXER_GET_CLASS (mixer); GstMixerInterface *iface = GST_MIXER_GET_INTERFACE (mixer);
return klass->mixer_type; return iface->mixer_type;
} }
/** /**
@ -370,13 +370,13 @@ gst_mixer_get_mixer_type (GstMixer * mixer)
GstMixerFlags GstMixerFlags
gst_mixer_get_mixer_flags (GstMixer * mixer) gst_mixer_get_mixer_flags (GstMixer * mixer)
{ {
GstMixerClass *klass; GstMixerInterface *iface;
g_return_val_if_fail (mixer != NULL, FALSE); g_return_val_if_fail (mixer != NULL, FALSE);
klass = GST_MIXER_GET_CLASS (mixer); iface = GST_MIXER_GET_INTERFACE (mixer);
if (klass->get_mixer_flags) { if (iface->get_mixer_flags) {
return klass->get_mixer_flags (mixer); return iface->get_mixer_flags (mixer);
} }
return GST_MIXER_FLAG_NONE; return GST_MIXER_FLAG_NONE;
} }

12
gst-libs/gst/interfaces/mixer.h
View file

@ -35,19 +35,15 @@ G_BEGIN_DECLS
(gst_mixer_get_type ()) (gst_mixer_get_type ())
#define GST_MIXER(obj) \ #define GST_MIXER(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MIXER, GstMixer)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MIXER, GstMixer))
#define GST_MIXER_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_MIXER, GstMixerClass))
#define GST_IS_MIXER(obj) \ #define GST_IS_MIXER(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MIXER)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MIXER))
#define GST_IS_MIXER_CLASS(klass) \ #define GST_MIXER_GET_INTERFACE(inst) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MIXER)) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_MIXER, GstMixerInterface))
#define GST_MIXER_GET_CLASS(inst) \
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_MIXER, GstMixerClass))
#define GST_MIXER_TYPE(klass) (klass->mixer_type) #define GST_MIXER_TYPE(klass) (klass->mixer_type)
typedef struct _GstMixer GstMixer; typedef struct _GstMixer GstMixer;
typedef struct _GstMixerClass GstMixerClass; typedef struct _GstMixerInterface GstMixerInterface;
/** /**
* GstMixerType: * GstMixerType:
@ -116,7 +112,7 @@ typedef enum
GST_MIXER_FLAG_GROUPING = (1<<2), GST_MIXER_FLAG_GROUPING = (1<<2),
} GstMixerFlags; } GstMixerFlags;
struct _GstMixerClass { struct _GstMixerInterface {
GTypeInterface klass; GTypeInterface klass;
GstMixerType mixer_type; GstMixerType mixer_type;

2
gst-libs/gst/interfaces/navigation.c
View file

@ -111,7 +111,7 @@ gst_navigation_class_init (GstNavigationInterface * iface)
void void
gst_navigation_send_event (GstNavigation * navigation, GstStructure * structure) gst_navigation_send_event (GstNavigation * navigation, GstStructure * structure)
{ {
GstNavigationInterface *iface = GST_NAVIGATION_GET_IFACE (navigation); GstNavigationInterface *iface = GST_NAVIGATION_GET_INTERFACE (navigation);
if (iface->send_event) { if (iface->send_event) {
iface->send_event (navigation, structure); iface->send_event (navigation, structure);

2
gst-libs/gst/interfaces/navigation.h
View file

@ -33,7 +33,7 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_NAVIGATION, GstNavigation)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_NAVIGATION, GstNavigation))
#define GST_IS_NAVIGATION(obj) \ #define GST_IS_NAVIGATION(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_NAVIGATION)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_NAVIGATION))
#define GST_NAVIGATION_GET_IFACE(obj) \ #define GST_NAVIGATION_GET_INTERFACE(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_NAVIGATION, GstNavigationInterface)) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_NAVIGATION, GstNavigationInterface))
typedef struct _GstNavigation GstNavigation; typedef struct _GstNavigation GstNavigation;

8
gst-libs/gst/interfaces/propertyprobe.c
View file

@ -116,7 +116,7 @@ gst_property_probe_get_properties (GstPropertyProbe * probe)
g_return_val_if_fail (probe != NULL, NULL); g_return_val_if_fail (probe != NULL, NULL);
g_return_val_if_fail (GST_IS_PROPERTY_PROBE (probe), NULL); g_return_val_if_fail (GST_IS_PROPERTY_PROBE (probe), NULL);
iface = GST_PROPERTY_PROBE_GET_IFACE (probe); iface = GST_PROPERTY_PROBE_GET_INTERFACE (probe);
if (iface->get_properties) if (iface->get_properties)
return iface->get_properties (probe); return iface->get_properties (probe);
@ -177,7 +177,7 @@ gst_property_probe_probe_property (GstPropertyProbe * probe,
g_return_if_fail (GST_IS_PROPERTY_PROBE (probe)); g_return_if_fail (GST_IS_PROPERTY_PROBE (probe));
g_return_if_fail (pspec != NULL); g_return_if_fail (pspec != NULL);
iface = GST_PROPERTY_PROBE_GET_IFACE (probe); iface = GST_PROPERTY_PROBE_GET_INTERFACE (probe);
if (iface->probe_property) if (iface->probe_property)
iface->probe_property (probe, pspec->param_id, pspec); iface->probe_property (probe, pspec->param_id, pspec);
@ -232,7 +232,7 @@ gst_property_probe_needs_probe (GstPropertyProbe * probe,
g_return_val_if_fail (GST_IS_PROPERTY_PROBE (probe), FALSE); g_return_val_if_fail (GST_IS_PROPERTY_PROBE (probe), FALSE);
g_return_val_if_fail (pspec != NULL, FALSE); g_return_val_if_fail (pspec != NULL, FALSE);
iface = GST_PROPERTY_PROBE_GET_IFACE (probe); iface = GST_PROPERTY_PROBE_GET_INTERFACE (probe);
if (iface->needs_probe) if (iface->needs_probe)
return iface->needs_probe (probe, pspec->param_id, pspec); return iface->needs_probe (probe, pspec->param_id, pspec);
@ -288,7 +288,7 @@ gst_property_probe_get_values (GstPropertyProbe * probe,
g_return_val_if_fail (GST_IS_PROPERTY_PROBE (probe), NULL); g_return_val_if_fail (GST_IS_PROPERTY_PROBE (probe), NULL);
g_return_val_if_fail (pspec != NULL, NULL); g_return_val_if_fail (pspec != NULL, NULL);
iface = GST_PROPERTY_PROBE_GET_IFACE (probe); iface = GST_PROPERTY_PROBE_GET_INTERFACE (probe);
if (iface->get_values) if (iface->get_values)
return iface->get_values (probe, pspec->param_id, pspec); return iface->get_values (probe, pspec->param_id, pspec);

2
gst-libs/gst/interfaces/propertyprobe.h
View file

@ -32,7 +32,7 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PROPERTY_PROBE, GstPropertyProbe)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PROPERTY_PROBE, GstPropertyProbe))
#define GST_IS_PROPERTY_PROBE(obj) \ #define GST_IS_PROPERTY_PROBE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PROPERTY_PROBE)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PROPERTY_PROBE))
#define GST_PROPERTY_PROBE_GET_IFACE(obj) \ #define GST_PROPERTY_PROBE_GET_INTERFACE(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_PROPERTY_PROBE, GstPropertyProbeInterface)) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_PROPERTY_PROBE, GstPropertyProbeInterface))
/** /**

104
gst-libs/gst/interfaces/tuner.c
View file

@ -83,7 +83,7 @@ enum
LAST_SIGNAL LAST_SIGNAL
}; };
static void gst_tuner_class_init (GstTunerClass * klass); static void gst_tuner_class_init (GstTunerInterface * iface);
static guint gst_tuner_signals[LAST_SIGNAL] = { 0 }; static guint gst_tuner_signals[LAST_SIGNAL] = { 0 };
@ -94,7 +94,7 @@ gst_tuner_get_type (void)
if (!gst_tuner_type) { if (!gst_tuner_type) {
static const GTypeInfo gst_tuner_info = { static const GTypeInfo gst_tuner_info = {
sizeof (GstTunerClass), sizeof (GstTunerInterface),
(GBaseInitFunc) gst_tuner_class_init, (GBaseInitFunc) gst_tuner_class_init,
NULL, NULL,
NULL, NULL,
@ -113,7 +113,7 @@ gst_tuner_get_type (void)
} }
static void static void
gst_tuner_class_init (GstTunerClass * klass) gst_tuner_class_init (GstTunerInterface * iface)
{ {
static gboolean initialized = FALSE; static gboolean initialized = FALSE;
@ -128,7 +128,7 @@ gst_tuner_class_init (GstTunerClass * klass)
gst_tuner_signals[NORM_CHANGED] = gst_tuner_signals[NORM_CHANGED] =
g_signal_new ("norm-changed", g_signal_new ("norm-changed",
GST_TYPE_TUNER, G_SIGNAL_RUN_LAST, GST_TYPE_TUNER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstTunerClass, norm_changed), G_STRUCT_OFFSET (GstTunerInterface, norm_changed),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_TUNER_NORM); g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_TUNER_NORM);
/** /**
@ -141,7 +141,7 @@ gst_tuner_class_init (GstTunerClass * klass)
gst_tuner_signals[CHANNEL_CHANGED] = gst_tuner_signals[CHANNEL_CHANGED] =
g_signal_new ("channel-changed", g_signal_new ("channel-changed",
GST_TYPE_TUNER, G_SIGNAL_RUN_LAST, GST_TYPE_TUNER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstTunerClass, channel_changed), G_STRUCT_OFFSET (GstTunerInterface, channel_changed),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
GST_TYPE_TUNER_CHANNEL); GST_TYPE_TUNER_CHANNEL);
@ -155,7 +155,7 @@ gst_tuner_class_init (GstTunerClass * klass)
gst_tuner_signals[FREQUENCY_CHANGED] = gst_tuner_signals[FREQUENCY_CHANGED] =
g_signal_new ("frequency-changed", g_signal_new ("frequency-changed",
GST_TYPE_TUNER, G_SIGNAL_RUN_LAST, GST_TYPE_TUNER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstTunerClass, frequency_changed), G_STRUCT_OFFSET (GstTunerInterface, frequency_changed),
NULL, NULL, NULL, NULL,
gst_interfaces_marshal_VOID__OBJECT_ULONG, G_TYPE_NONE, 2, gst_interfaces_marshal_VOID__OBJECT_ULONG, G_TYPE_NONE, 2,
GST_TYPE_TUNER_CHANNEL, G_TYPE_ULONG); GST_TYPE_TUNER_CHANNEL, G_TYPE_ULONG);
@ -172,7 +172,7 @@ gst_tuner_class_init (GstTunerClass * klass)
gst_tuner_signals[SIGNAL_CHANGED] = gst_tuner_signals[SIGNAL_CHANGED] =
g_signal_new ("signal-changed", g_signal_new ("signal-changed",
GST_TYPE_TUNER, G_SIGNAL_RUN_LAST, GST_TYPE_TUNER, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstTunerClass, signal_changed), G_STRUCT_OFFSET (GstTunerInterface, signal_changed),
NULL, NULL, NULL, NULL,
gst_interfaces_marshal_VOID__OBJECT_INT, G_TYPE_NONE, 2, gst_interfaces_marshal_VOID__OBJECT_INT, G_TYPE_NONE, 2,
GST_TYPE_TUNER_CHANNEL, G_TYPE_INT); GST_TYPE_TUNER_CHANNEL, G_TYPE_INT);
@ -181,17 +181,17 @@ gst_tuner_class_init (GstTunerClass * klass)
} }
/* default virtual functions */ /* default virtual functions */
klass->list_channels = NULL; iface->list_channels = NULL;
klass->set_channel = NULL; iface->set_channel = NULL;
klass->get_channel = NULL; iface->get_channel = NULL;
klass->list_norms = NULL; iface->list_norms = NULL;
klass->set_norm = NULL; iface->set_norm = NULL;
klass->get_norm = NULL; iface->get_norm = NULL;
klass->set_frequency = NULL; iface->set_frequency = NULL;
klass->get_frequency = NULL; iface->get_frequency = NULL;
klass->signal_strength = NULL; iface->signal_strength = NULL;
} }
/** /**
@ -207,13 +207,13 @@ gst_tuner_class_init (GstTunerClass * klass)
const GList * const GList *
gst_tuner_list_channels (GstTuner * tuner) gst_tuner_list_channels (GstTuner * tuner)
{ {
GstTunerClass *klass; GstTunerInterface *iface;
g_return_val_if_fail (GST_IS_TUNER (tuner), NULL); g_return_val_if_fail (GST_IS_TUNER (tuner), NULL);
klass = GST_TUNER_GET_CLASS (tuner); iface = GST_TUNER_GET_INTERFACE (tuner);
if (klass->list_channels) { if (iface->list_channels) {
return klass->list_channels (tuner); return iface->list_channels (tuner);
} }
return NULL; return NULL;
@ -231,13 +231,13 @@ gst_tuner_list_channels (GstTuner * tuner)
void void
gst_tuner_set_channel (GstTuner * tuner, GstTunerChannel * channel) gst_tuner_set_channel (GstTuner * tuner, GstTunerChannel * channel)
{ {
GstTunerClass *klass; GstTunerInterface *iface;
g_return_if_fail (GST_IS_TUNER (tuner)); g_return_if_fail (GST_IS_TUNER (tuner));
klass = GST_TUNER_GET_CLASS (tuner); iface = GST_TUNER_GET_INTERFACE (tuner);
if (klass->set_channel) { if (iface->set_channel) {
klass->set_channel (tuner, channel); iface->set_channel (tuner, channel);
} }
} }
@ -253,13 +253,13 @@ gst_tuner_set_channel (GstTuner * tuner, GstTunerChannel * channel)
GstTunerChannel * GstTunerChannel *
gst_tuner_get_channel (GstTuner * tuner) gst_tuner_get_channel (GstTuner * tuner)
{ {
GstTunerClass *klass; GstTunerInterface *iface;
g_return_val_if_fail (GST_IS_TUNER (tuner), NULL); g_return_val_if_fail (GST_IS_TUNER (tuner), NULL);
klass = GST_TUNER_GET_CLASS (tuner); iface = GST_TUNER_GET_INTERFACE (tuner);
if (klass->get_channel) { if (iface->get_channel) {
return klass->get_channel (tuner); return iface->get_channel (tuner);
} }
return NULL; return NULL;
@ -280,13 +280,13 @@ gst_tuner_get_channel (GstTuner * tuner)
const GList * const GList *
gst_tuner_list_norms (GstTuner * tuner) gst_tuner_list_norms (GstTuner * tuner)
{ {
GstTunerClass *klass; GstTunerInterface *iface;
g_return_val_if_fail (GST_IS_TUNER (tuner), NULL); g_return_val_if_fail (GST_IS_TUNER (tuner), NULL);
klass = GST_TUNER_GET_CLASS (tuner); iface = GST_TUNER_GET_INTERFACE (tuner);
if (klass->list_norms) { if (iface->list_norms) {
return klass->list_norms (tuner); return iface->list_norms (tuner);
} }
return NULL; return NULL;
@ -304,13 +304,13 @@ gst_tuner_list_norms (GstTuner * tuner)
void void
gst_tuner_set_norm (GstTuner * tuner, GstTunerNorm * norm) gst_tuner_set_norm (GstTuner * tuner, GstTunerNorm * norm)
{ {
GstTunerClass *klass; GstTunerInterface *iface;
g_return_if_fail (GST_IS_TUNER (tuner)); g_return_if_fail (GST_IS_TUNER (tuner));
klass = GST_TUNER_GET_CLASS (tuner); iface = GST_TUNER_GET_INTERFACE (tuner);
if (klass->set_norm) { if (iface->set_norm) {
klass->set_norm (tuner, norm); iface->set_norm (tuner, norm);
} }
} }
@ -327,13 +327,13 @@ gst_tuner_set_norm (GstTuner * tuner, GstTunerNorm * norm)
GstTunerNorm * GstTunerNorm *
gst_tuner_get_norm (GstTuner * tuner) gst_tuner_get_norm (GstTuner * tuner)
{ {
GstTunerClass *klass; GstTunerInterface *iface;
g_return_val_if_fail (GST_IS_TUNER (tuner), NULL); g_return_val_if_fail (GST_IS_TUNER (tuner), NULL);
klass = GST_TUNER_GET_CLASS (tuner); iface = GST_TUNER_GET_INTERFACE (tuner);
if (klass->get_norm) { if (iface->get_norm) {
return klass->get_norm (tuner); return iface->get_norm (tuner);
} }
return NULL; return NULL;
@ -360,16 +360,16 @@ void
gst_tuner_set_frequency (GstTuner * tuner, gst_tuner_set_frequency (GstTuner * tuner,
GstTunerChannel * channel, gulong frequency) GstTunerChannel * channel, gulong frequency)
{ {
GstTunerClass *klass; GstTunerInterface *iface;
g_return_if_fail (GST_IS_TUNER (tuner)); g_return_if_fail (GST_IS_TUNER (tuner));
g_return_if_fail (GST_IS_TUNER_CHANNEL (channel)); g_return_if_fail (GST_IS_TUNER_CHANNEL (channel));
g_return_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel, g_return_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel,
GST_TUNER_CHANNEL_FREQUENCY)); GST_TUNER_CHANNEL_FREQUENCY));
klass = GST_TUNER_GET_CLASS (tuner); iface = GST_TUNER_GET_INTERFACE (tuner);
if (klass->set_frequency) { if (iface->set_frequency) {
klass->set_frequency (tuner, channel, frequency); iface->set_frequency (tuner, channel, frequency);
} }
} }
@ -388,17 +388,17 @@ gst_tuner_set_frequency (GstTuner * tuner,
gulong gulong
gst_tuner_get_frequency (GstTuner * tuner, GstTunerChannel * channel) gst_tuner_get_frequency (GstTuner * tuner, GstTunerChannel * channel)
{ {
GstTunerClass *klass; GstTunerInterface *iface;
g_return_val_if_fail (GST_IS_TUNER (tuner), 0); g_return_val_if_fail (GST_IS_TUNER (tuner), 0);
g_return_val_if_fail (GST_IS_TUNER_CHANNEL (channel), 0); g_return_val_if_fail (GST_IS_TUNER_CHANNEL (channel), 0);
g_return_val_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel, g_return_val_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel,
GST_TUNER_CHANNEL_FREQUENCY), 0); GST_TUNER_CHANNEL_FREQUENCY), 0);
klass = GST_TUNER_GET_CLASS (tuner); iface = GST_TUNER_GET_INTERFACE (tuner);
if (klass->get_frequency) { if (iface->get_frequency) {
return klass->get_frequency (tuner, channel); return iface->get_frequency (tuner, channel);
} }
return 0; return 0;
@ -423,16 +423,16 @@ gst_tuner_get_frequency (GstTuner * tuner, GstTunerChannel * channel)
gint gint
gst_tuner_signal_strength (GstTuner * tuner, GstTunerChannel * channel) gst_tuner_signal_strength (GstTuner * tuner, GstTunerChannel * channel)
{ {
GstTunerClass *klass; GstTunerInterface *iface;
g_return_val_if_fail (GST_IS_TUNER (tuner), 0); g_return_val_if_fail (GST_IS_TUNER (tuner), 0);
g_return_val_if_fail (GST_IS_TUNER_CHANNEL (channel), 0); g_return_val_if_fail (GST_IS_TUNER_CHANNEL (channel), 0);
g_return_val_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel, g_return_val_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel,
GST_TUNER_CHANNEL_FREQUENCY), 0); GST_TUNER_CHANNEL_FREQUENCY), 0);
klass = GST_TUNER_GET_CLASS (tuner); iface = GST_TUNER_GET_INTERFACE (tuner);
if (klass->signal_strength) { if (iface->signal_strength) {
return klass->signal_strength (tuner, channel); return iface->signal_strength (tuner, channel);
} }
return 0; return 0;

14
gst-libs/gst/interfaces/tuner.h
View file

@ -35,20 +35,16 @@ G_BEGIN_DECLS
(gst_tuner_get_type ()) (gst_tuner_get_type ())
#define GST_TUNER(obj) \ #define GST_TUNER(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER, GstTuner)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER, GstTuner))
#define GST_TUNER_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_TUNER, GstTunerClass))
#define GST_IS_TUNER(obj) \ #define GST_IS_TUNER(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TUNER)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TUNER))
#define GST_IS_TUNER_CLASS(klass) \ #define GST_TUNER_GET_INTERFACE(inst) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TUNER)) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_TUNER, GstTunerInterface))
#define GST_TUNER_GET_CLASS(inst) \
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_TUNER, GstTunerClass))
typedef struct _GstTuner GstTuner; typedef struct _GstTuner GstTuner;
typedef struct _GstTunerClass GstTunerClass; typedef struct _GstTunerInterface GstTunerInterface;
/** /**
* GstTunerClass: * GstTunerInterface:
* @klass: the parent interface * @klass: the parent interface
* @list_channels: list available channels * @list_channels: list available channels
* @set_channel: set to a channel * @set_channel: set to a channel
@ -66,7 +62,7 @@ typedef struct _GstTunerClass GstTunerClass;
* *
* Tuner interface. * Tuner interface.
*/ */
struct _GstTunerClass { struct _GstTunerInterface {
GTypeInterface klass; GTypeInterface klass;
/* virtual functions */ /* virtual functions */

16
gst-libs/gst/interfaces/videoorientation.c
View file

@ -101,7 +101,7 @@ gst_video_orientation_get_hflip (GstVideoOrientation * video_orientation,
gboolean * flip) gboolean * flip)
{ {
GstVideoOrientationInterface *iface = GstVideoOrientationInterface *iface =
GST_VIDEO_ORIENTATION_GET_IFACE (video_orientation); GST_VIDEO_ORIENTATION_GET_INTERFACE (video_orientation);
if (iface->get_hflip) { if (iface->get_hflip) {
return iface->get_hflip (video_orientation, flip); return iface->get_hflip (video_orientation, flip);
@ -124,7 +124,7 @@ gst_video_orientation_get_vflip (GstVideoOrientation * video_orientation,
gboolean * flip) gboolean * flip)
{ {
GstVideoOrientationInterface *iface = GstVideoOrientationInterface *iface =
GST_VIDEO_ORIENTATION_GET_IFACE (video_orientation); GST_VIDEO_ORIENTATION_GET_INTERFACE (video_orientation);
if (iface->get_vflip) { if (iface->get_vflip) {
return iface->get_vflip (video_orientation, flip); return iface->get_vflip (video_orientation, flip);
@ -147,7 +147,7 @@ gst_video_orientation_get_hcenter (GstVideoOrientation * video_orientation,
gint * center) gint * center)
{ {
GstVideoOrientationInterface *iface = GstVideoOrientationInterface *iface =
GST_VIDEO_ORIENTATION_GET_IFACE (video_orientation); GST_VIDEO_ORIENTATION_GET_INTERFACE (video_orientation);
if (iface->get_hcenter) { if (iface->get_hcenter) {
return iface->get_hcenter (video_orientation, center); return iface->get_hcenter (video_orientation, center);
@ -170,7 +170,7 @@ gst_video_orientation_get_vcenter (GstVideoOrientation * video_orientation,
gint * center) gint * center)
{ {
GstVideoOrientationInterface *iface = GstVideoOrientationInterface *iface =
GST_VIDEO_ORIENTATION_GET_IFACE (video_orientation); GST_VIDEO_ORIENTATION_GET_INTERFACE (video_orientation);
if (iface->get_vcenter) { if (iface->get_vcenter) {
return iface->get_vcenter (video_orientation, center); return iface->get_vcenter (video_orientation, center);
@ -193,7 +193,7 @@ gst_video_orientation_set_hflip (GstVideoOrientation * video_orientation,
gboolean flip) gboolean flip)
{ {
GstVideoOrientationInterface *iface = GstVideoOrientationInterface *iface =
GST_VIDEO_ORIENTATION_GET_IFACE (video_orientation); GST_VIDEO_ORIENTATION_GET_INTERFACE (video_orientation);
if (iface->set_hflip) { if (iface->set_hflip) {
return iface->set_hflip (video_orientation, flip); return iface->set_hflip (video_orientation, flip);
@ -216,7 +216,7 @@ gst_video_orientation_set_vflip (GstVideoOrientation * video_orientation,
gboolean flip) gboolean flip)
{ {
GstVideoOrientationInterface *iface = GstVideoOrientationInterface *iface =
GST_VIDEO_ORIENTATION_GET_IFACE (video_orientation); GST_VIDEO_ORIENTATION_GET_INTERFACE (video_orientation);
if (iface->set_vflip) { if (iface->set_vflip) {
return iface->set_vflip (video_orientation, flip); return iface->set_vflip (video_orientation, flip);
@ -239,7 +239,7 @@ gst_video_orientation_set_hcenter (GstVideoOrientation * video_orientation,
gint center) gint center)
{ {
GstVideoOrientationInterface *iface = GstVideoOrientationInterface *iface =
GST_VIDEO_ORIENTATION_GET_IFACE (video_orientation); GST_VIDEO_ORIENTATION_GET_INTERFACE (video_orientation);
if (iface->set_hcenter) { if (iface->set_hcenter) {
return iface->set_hcenter (video_orientation, center); return iface->set_hcenter (video_orientation, center);
@ -262,7 +262,7 @@ gst_video_orientation_set_vcenter (GstVideoOrientation * video_orientation,
gint center) gint center)
{ {
GstVideoOrientationInterface *iface = GstVideoOrientationInterface *iface =
GST_VIDEO_ORIENTATION_GET_IFACE (video_orientation); GST_VIDEO_ORIENTATION_GET_INTERFACE (video_orientation);
if (iface->set_vcenter) { if (iface->set_vcenter) {
return iface->set_vcenter (video_orientation, center); return iface->set_vcenter (video_orientation, center);

2
gst-libs/gst/interfaces/videoorientation.h
View file

@ -33,7 +33,7 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_ORIENTATION, GstVideoOrientation)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_ORIENTATION, GstVideoOrientation))
#define GST_IS_VIDEO_ORIENTATION(obj) \ #define GST_IS_VIDEO_ORIENTATION(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_ORIENTATION)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_ORIENTATION))
#define GST_VIDEO_ORIENTATION_GET_IFACE(inst) \ #define GST_VIDEO_ORIENTATION_GET_INTERFACE(inst) \
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_VIDEO_ORIENTATION, GstVideoOrientationInterface)) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_VIDEO_ORIENTATION, GstVideoOrientationInterface))
/** /**

18
gst-libs/gst/interfaces/videooverlay.c
View file

@ -298,7 +298,7 @@ gst_video_overlay_get_type (void)
if (!gst_video_overlay_type) { if (!gst_video_overlay_type) {
static const GTypeInfo gst_video_overlay_info = { static const GTypeInfo gst_video_overlay_info = {
sizeof (GstVideoOverlayIface), sizeof (GstVideoOverlayInterface),
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -331,12 +331,12 @@ gst_video_overlay_get_type (void)
void void
gst_video_overlay_set_window_handle (GstVideoOverlay * overlay, guintptr handle) gst_video_overlay_set_window_handle (GstVideoOverlay * overlay, guintptr handle)
{ {
GstVideoOverlayIface *iface; GstVideoOverlayInterface *iface;
g_return_if_fail (overlay != NULL); g_return_if_fail (overlay != NULL);
g_return_if_fail (GST_IS_VIDEO_OVERLAY (overlay)); g_return_if_fail (GST_IS_VIDEO_OVERLAY (overlay));
iface = GST_VIDEO_OVERLAY_GET_IFACE (overlay); iface = GST_VIDEO_OVERLAY_GET_INTERFACE (overlay);
if (iface->set_window_handle) { if (iface->set_window_handle) {
iface->set_window_handle (overlay, handle); iface->set_window_handle (overlay, handle);
@ -405,12 +405,12 @@ gst_video_overlay_prepare_window_handle (GstVideoOverlay * overlay)
void void
gst_video_overlay_expose (GstVideoOverlay * overlay) gst_video_overlay_expose (GstVideoOverlay * overlay)
{ {
GstVideoOverlayIface *iface; GstVideoOverlayInterface *iface;
g_return_if_fail (overlay != NULL); g_return_if_fail (overlay != NULL);
g_return_if_fail (GST_IS_VIDEO_OVERLAY (overlay)); g_return_if_fail (GST_IS_VIDEO_OVERLAY (overlay));
iface = GST_VIDEO_OVERLAY_GET_IFACE (overlay); iface = GST_VIDEO_OVERLAY_GET_INTERFACE (overlay);
if (iface->expose) { if (iface->expose) {
iface->expose (overlay); iface->expose (overlay);
@ -434,12 +434,12 @@ void
gst_video_overlay_handle_events (GstVideoOverlay * overlay, gst_video_overlay_handle_events (GstVideoOverlay * overlay,
gboolean handle_events) gboolean handle_events)
{ {
GstVideoOverlayIface *iface; GstVideoOverlayInterface *iface;
g_return_if_fail (overlay != NULL); g_return_if_fail (overlay != NULL);
g_return_if_fail (GST_IS_VIDEO_OVERLAY (overlay)); g_return_if_fail (GST_IS_VIDEO_OVERLAY (overlay));
iface = GST_VIDEO_OVERLAY_GET_IFACE (overlay); iface = GST_VIDEO_OVERLAY_GET_INTERFACE (overlay);
if (iface->handle_events) { if (iface->handle_events) {
iface->handle_events (overlay, handle_events); iface->handle_events (overlay, handle_events);
@ -473,14 +473,14 @@ gboolean
gst_video_overlay_set_render_rectangle (GstVideoOverlay * overlay, gst_video_overlay_set_render_rectangle (GstVideoOverlay * overlay,
gint x, gint y, gint width, gint height) gint x, gint y, gint width, gint height)
{ {
GstVideoOverlayIface *iface; GstVideoOverlayInterface *iface;
g_return_val_if_fail (overlay != NULL, FALSE); g_return_val_if_fail (overlay != NULL, FALSE);
g_return_val_if_fail (GST_IS_VIDEO_OVERLAY (overlay), FALSE); g_return_val_if_fail (GST_IS_VIDEO_OVERLAY (overlay), FALSE);
g_return_val_if_fail ((width == -1 && height == -1) || g_return_val_if_fail ((width == -1 && height == -1) ||
(width > 0 && height > 0), FALSE); (width > 0 && height > 0), FALSE);
iface = GST_VIDEO_OVERLAY_GET_IFACE (overlay); iface = GST_VIDEO_OVERLAY_GET_INTERFACE (overlay);
if (iface->set_render_rectangle) { if (iface->set_render_rectangle) {
iface->set_render_rectangle (overlay, x, y, width, height); iface->set_render_rectangle (overlay, x, y, width, height);

10
gst-libs/gst/interfaces/videooverlay.h
View file

@ -32,8 +32,8 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_OVERLAY, GstVideoOverlay)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_OVERLAY, GstVideoOverlay))
#define GST_IS_VIDEO_OVERLAY(obj) \ #define GST_IS_VIDEO_OVERLAY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_OVERLAY)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_OVERLAY))
#define GST_VIDEO_OVERLAY_GET_IFACE(inst) \ #define GST_VIDEO_OVERLAY_GET_INTERFACE(inst) \
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_VIDEO_OVERLAY, GstVideoOverlayIface)) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_VIDEO_OVERLAY, GstVideoOverlayInterface))
/** /**
* GstVideoOverlay: * GstVideoOverlay:
@ -41,10 +41,10 @@ G_BEGIN_DECLS
* Opaque #GstVideoOverlay interface structure * Opaque #GstVideoOverlay interface structure
*/ */
typedef struct _GstVideoOverlay GstVideoOverlay; typedef struct _GstVideoOverlay GstVideoOverlay;
typedef struct _GstVideoOverlayIface GstVideoOverlayIface; typedef struct _GstVideoOverlayInterface GstVideoOverlayInterface;
/** /**
* GstVideoOverlayIface: * GstVideoOverlayInterface:
* @interface: parent interface type. * @interface: parent interface type.
* @expose: virtual method to handle expose events * @expose: virtual method to handle expose events
* @handle_events: virtual method to handle events * @handle_events: virtual method to handle events
@ -53,7 +53,7 @@ typedef struct _GstVideoOverlayIface GstVideoOverlayIface;
* *
* #GstVideoOverlay interface * #GstVideoOverlay interface
*/ */
struct _GstVideoOverlayIface { struct _GstVideoOverlayInterface {
GTypeInterface interface; GTypeInterface interface;
/* virtual functions */ /* virtual functions */

18
gst-libs/gst/rtsp/gstrtspextension.c
View file

@ -96,7 +96,7 @@ gst_rtsp_extension_detect_server (GstRTSPExtension * ext, GstRTSPMessage * resp)
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
gboolean res = TRUE; gboolean res = TRUE;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->detect_server) if (iface->detect_server)
res = iface->detect_server (ext, resp); res = iface->detect_server (ext, resp);
@ -109,7 +109,7 @@ gst_rtsp_extension_before_send (GstRTSPExtension * ext, GstRTSPMessage * req)
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->before_send) if (iface->before_send)
res = iface->before_send (ext, req); res = iface->before_send (ext, req);
@ -123,7 +123,7 @@ gst_rtsp_extension_after_send (GstRTSPExtension * ext, GstRTSPMessage * req,
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->after_send) if (iface->after_send)
res = iface->after_send (ext, req, resp); res = iface->after_send (ext, req, resp);
@ -137,7 +137,7 @@ gst_rtsp_extension_parse_sdp (GstRTSPExtension * ext, GstSDPMessage * sdp,
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->parse_sdp) if (iface->parse_sdp)
res = iface->parse_sdp (ext, sdp, s); res = iface->parse_sdp (ext, sdp, s);
@ -150,7 +150,7 @@ gst_rtsp_extension_setup_media (GstRTSPExtension * ext, GstSDPMedia * media)
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->setup_media) if (iface->setup_media)
res = iface->setup_media (ext, media); res = iface->setup_media (ext, media);
@ -163,7 +163,7 @@ gst_rtsp_extension_configure_stream (GstRTSPExtension * ext, GstCaps * caps)
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
gboolean res = TRUE; gboolean res = TRUE;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->configure_stream) if (iface->configure_stream)
res = iface->configure_stream (ext, caps); res = iface->configure_stream (ext, caps);
@ -177,7 +177,7 @@ gst_rtsp_extension_get_transports (GstRTSPExtension * ext,
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->get_transports) if (iface->get_transports)
res = iface->get_transports (ext, protocols, transport); res = iface->get_transports (ext, protocols, transport);
@ -190,7 +190,7 @@ gst_rtsp_extension_stream_select (GstRTSPExtension * ext, GstRTSPUrl * url)
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_OK; GstRTSPResult res = GST_RTSP_OK;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->stream_select) if (iface->stream_select)
res = iface->stream_select (ext, url); res = iface->stream_select (ext, url);
@ -204,7 +204,7 @@ gst_rtsp_extension_receive_request (GstRTSPExtension * ext,
GstRTSPExtensionInterface *iface; GstRTSPExtensionInterface *iface;
GstRTSPResult res = GST_RTSP_ENOTIMPL; GstRTSPResult res = GST_RTSP_ENOTIMPL;
iface = GST_RTSP_EXTENSION_GET_IFACE (ext); iface = GST_RTSP_EXTENSION_GET_INTERFACE (ext);
if (iface->receive_request) if (iface->receive_request)
res = iface->receive_request (ext, msg); res = iface->receive_request (ext, msg);

2
gst-libs/gst/rtsp/gstrtspextension.h
View file

@ -37,7 +37,7 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_RTSP_EXTENSION, GstRTSPExtension)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_RTSP_EXTENSION, GstRTSPExtension))
#define GST_IS_RTSP_EXTENSION(obj) \ #define GST_IS_RTSP_EXTENSION(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_RTSP_EXTENSION)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_RTSP_EXTENSION))
#define GST_RTSP_EXTENSION_GET_IFACE(inst) \ #define GST_RTSP_EXTENSION_GET_INTERFACE(inst) \
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_RTSP_EXTENSION, GstRTSPExtensionInterface)) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_RTSP_EXTENSION, GstRTSPExtensionInterface))
typedef struct _GstRTSPExtension GstRTSPExtension; typedef struct _GstRTSPExtension GstRTSPExtension;

14
gst/volume/gstvolume.c
View file

@ -112,7 +112,7 @@ enum
GST_AUDIO_CAPS_MAKE ("{ F32BE, F64BE, S8, S16BE, S24BE, S32BE }") GST_AUDIO_CAPS_MAKE ("{ F32BE, F64BE, S8, S16BE, S24BE, S32BE }")
#endif #endif
static void gst_volume_mixer_init (GstMixerClass * iface); static void gst_volume_mixer_init (GstMixerInterface * iface);
#define gst_volume_parent_class parent_class #define gst_volume_parent_class parent_class
G_DEFINE_TYPE_WITH_CODE (GstVolume, gst_volume, G_DEFINE_TYPE_WITH_CODE (GstVolume, gst_volume,
@ -335,15 +335,15 @@ gst_volume_set_mute (GstMixer * mixer, GstMixerTrack * track, gboolean mute)
} }
static void static void
gst_volume_mixer_init (GstMixerClass * klass) gst_volume_mixer_init (GstMixerInterface * iface)
{ {
GST_MIXER_TYPE (klass) = GST_MIXER_SOFTWARE; GST_MIXER_TYPE (iface) = GST_MIXER_SOFTWARE;
/* default virtual functions */ /* default virtual functions */
klass->list_tracks = gst_volume_list_tracks; iface->list_tracks = gst_volume_list_tracks;
klass->set_volume = gst_volume_set_volume; iface->set_volume = gst_volume_set_volume;
klass->get_volume = gst_volume_get_volume; iface->get_volume = gst_volume_get_volume;
klass->set_mute = gst_volume_set_mute; iface->set_mute = gst_volume_set_mute;
} }
/* Element class */ /* Element class */

7
sys/ximage/ximagesink.c
View file

@ -168,8 +168,9 @@ enum
/* Object typing & Creation */ /* Object typing & Creation */
/* */ /* */
/* =========================================== */ /* =========================================== */
static void gst_ximagesink_navigation_init (GstNavigationInterface * klass); static void gst_ximagesink_navigation_init (GstNavigationInterface * iface);
static void gst_ximagesink_video_overlay_init (GstVideoOverlayIface * iface); static void gst_ximagesink_video_overlay_init (GstVideoOverlayInterface *
iface);
#define gst_ximagesink_parent_class parent_class #define gst_ximagesink_parent_class parent_class
G_DEFINE_TYPE_WITH_CODE (GstXImageSink, gst_ximagesink, GST_TYPE_VIDEO_SINK, G_DEFINE_TYPE_WITH_CODE (GstXImageSink, gst_ximagesink, GST_TYPE_VIDEO_SINK,
G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION, gst_ximagesink_navigation_init); G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION, gst_ximagesink_navigation_init);
@ -1679,7 +1680,7 @@ gst_ximagesink_set_event_handling (GstVideoOverlay * overlay,
} }
static void static void
gst_ximagesink_video_overlay_init (GstVideoOverlayIface * iface) gst_ximagesink_video_overlay_init (GstVideoOverlayInterface * iface)
{ {
iface->set_window_handle = gst_ximagesink_set_window_handle; iface->set_window_handle = gst_ximagesink_set_window_handle;
iface->expose = gst_ximagesink_expose; iface->expose = gst_ximagesink_expose;

10
sys/xvimage/xvimagesink.c
View file

@ -194,8 +194,10 @@ enum
/* */ /* */
/* =========================================== */ /* =========================================== */
static void gst_xvimagesink_navigation_init (GstNavigationInterface * iface); static void gst_xvimagesink_navigation_init (GstNavigationInterface * iface);
static void gst_xvimagesink_video_overlay_init (GstVideoOverlayIface * iface); static void gst_xvimagesink_video_overlay_init (GstVideoOverlayInterface *
static void gst_xvimagesink_colorbalance_init (GstColorBalanceClass * iface); iface);
static void gst_xvimagesink_colorbalance_init (GstColorBalanceInterface *
iface);
static void static void
gst_xvimagesink_property_probe_interface_init (GstPropertyProbeInterface * gst_xvimagesink_property_probe_interface_init (GstPropertyProbeInterface *
iface); iface);
@ -2240,7 +2242,7 @@ gst_xvimagesink_set_render_rectangle (GstVideoOverlay * overlay, gint x, gint y,
} }
static void static void
gst_xvimagesink_video_overlay_init (GstVideoOverlayIface * iface) gst_xvimagesink_video_overlay_init (GstVideoOverlayInterface * iface)
{ {
iface->set_window_handle = gst_xvimagesink_set_window_handle; iface->set_window_handle = gst_xvimagesink_set_window_handle;
iface->expose = gst_xvimagesink_expose; iface->expose = gst_xvimagesink_expose;
@ -2322,7 +2324,7 @@ gst_xvimagesink_colorbalance_get_value (GstColorBalance * balance,
} }
static void static void
gst_xvimagesink_colorbalance_init (GstColorBalanceClass * iface) gst_xvimagesink_colorbalance_init (GstColorBalanceInterface * iface)
{ {
GST_COLOR_BALANCE_TYPE (iface) = GST_COLOR_BALANCE_HARDWARE; GST_COLOR_BALANCE_TYPE (iface) = GST_COLOR_BALANCE_HARDWARE;
iface->list_channels = gst_xvimagesink_colorbalance_list_channels; iface->list_channels = gst_xvimagesink_colorbalance_list_channels;

2
tests/check/libs/mixer.c
View file

@ -55,7 +55,7 @@ G_DEFINE_TYPE_WITH_CODE (TestElement, test_element, GST_TYPE_ELEMENT,
init_interface (g_define_type_id)); init_interface (g_define_type_id));
static void static void
test_element_mixer_interface_init (GstMixerClass * klass) test_element_mixer_interface_init (GstMixerInterface * iface)
{ {
/* Not actually implementing any interfaces for this test atm */ /* Not actually implementing any interfaces for this test atm */
} }

4
tests/check/libs/navigation.c
View file

@ -61,9 +61,9 @@ G_DEFINE_TYPE_WITH_CODE (TestElement, test_element, GST_TYPE_ELEMENT,
init_interface (g_define_type_id)); init_interface (g_define_type_id));
static void static void
test_element_navigation_interface_init (GstNavigationInterface * klass) test_element_navigation_interface_init (GstNavigationInterface * iface)
{ {
klass->send_event = nav_send_event; iface->send_event = nav_send_event;
} }
static void static void

8
tests/check/libs/struct_arm.h
View file

@ -31,7 +31,7 @@ GstCheckABIStruct list[] = {
{"GstCddaBaseSrcTrack", sizeof (GstCddaBaseSrcTrack), 36}, {"GstCddaBaseSrcTrack", sizeof (GstCddaBaseSrcTrack), 36},
{"GstColorBalanceChannelClass", sizeof (GstColorBalanceChannelClass), 88}, {"GstColorBalanceChannelClass", sizeof (GstColorBalanceChannelClass), 88},
{"GstColorBalanceChannel", sizeof (GstColorBalanceChannel), 24}, {"GstColorBalanceChannel", sizeof (GstColorBalanceChannel), 24},
{"GstColorBalanceClass", sizeof (GstColorBalanceClass), 44}, {"GstColorBalanceInterface", sizeof (GstColorBalanceInterface), 44},
{"GstDiscovererClass", sizeof (GstDiscovererClass), 96}, {"GstDiscovererClass", sizeof (GstDiscovererClass), 96},
{"GstDiscoverer", sizeof (GstDiscoverer), 32}, {"GstDiscoverer", sizeof (GstDiscoverer), 32},
{"GstFFTF32Complex", sizeof (GstFFTF32Complex), 8}, {"GstFFTF32Complex", sizeof (GstFFTF32Complex), 8},
@ -42,7 +42,7 @@ GstCheckABIStruct list[] = {
{"GstFFTS16", sizeof (GstFFTS16), 28}, {"GstFFTS16", sizeof (GstFFTS16), 28},
{"GstFFTS32Complex", sizeof (GstFFTS32Complex), 8}, {"GstFFTS32Complex", sizeof (GstFFTS32Complex), 8},
{"GstFFTS32", sizeof (GstFFTS32), 28}, {"GstFFTS32", sizeof (GstFFTS32), 28},
{"GstMixerClass", sizeof (GstMixerClass), 72}, {"GstMixerInterface", sizeof (GstMixerInterface), 72},
{"GstMixerOptionsClass", sizeof (GstMixerOptionsClass), 100}, {"GstMixerOptionsClass", sizeof (GstMixerOptionsClass), 100},
{"GstMixerOptions", sizeof (GstMixerOptions), 52}, {"GstMixerOptions", sizeof (GstMixerOptions), 52},
{"GstMixerTrackClass", sizeof (GstMixerTrackClass), 84}, {"GstMixerTrackClass", sizeof (GstMixerTrackClass), 84},
@ -86,7 +86,7 @@ GstCheckABIStruct list[] = {
{"GstTagDemux", sizeof (GstTagDemux), 160}, {"GstTagDemux", sizeof (GstTagDemux), 160},
{"GstTunerChannelClass", sizeof (GstTunerChannelClass), 92}, {"GstTunerChannelClass", sizeof (GstTunerChannelClass), 92},
{"GstTunerChannel", sizeof (GstTunerChannel), 40}, {"GstTunerChannel", sizeof (GstTunerChannel), 40},
{"GstTunerClass", sizeof (GstTunerClass), 76}, {"GstTunerInterface", sizeof (GstTunerInterface), 76},
{"GstTunerNormClass", sizeof (GstTunerNormClass), 84}, {"GstTunerNormClass", sizeof (GstTunerNormClass), 84},
{"GstTunerNorm", sizeof (GstTunerNorm), 40}, {"GstTunerNorm", sizeof (GstTunerNorm), 40},
{"GstVideoFilterClass", sizeof (GstVideoFilterClass), 376}, {"GstVideoFilterClass", sizeof (GstVideoFilterClass), 376},
@ -95,6 +95,6 @@ GstCheckABIStruct list[] = {
{"GstVideoRectangle", sizeof (GstVideoRectangle), 16}, {"GstVideoRectangle", sizeof (GstVideoRectangle), 16},
{"GstVideoSinkClass", sizeof (GstVideoSinkClass), 384}, {"GstVideoSinkClass", sizeof (GstVideoSinkClass), 384},
{"GstVideoSink", sizeof (GstVideoSink), 432}, {"GstVideoSink", sizeof (GstVideoSink), 432},
{"GstVideoOverlayIface", sizeof (GstVideoOverlayIface), 32}, {"GstVideoOverlayInterface", sizeof (GstVideoOverlayInterface), 32},
{NULL, 0, 0} {NULL, 0, 0}
}; };

8
tests/check/libs/struct_i386.h
View file

@ -29,7 +29,7 @@ GstCheckABIStruct list[] = {
{"GstCddaBaseSrcTrack", sizeof (GstCddaBaseSrcTrack), 36}, {"GstCddaBaseSrcTrack", sizeof (GstCddaBaseSrcTrack), 36},
{"GstColorBalanceChannelClass", sizeof (GstColorBalanceChannelClass), 88}, {"GstColorBalanceChannelClass", sizeof (GstColorBalanceChannelClass), 88},
{"GstColorBalanceChannel", sizeof (GstColorBalanceChannel), 24}, {"GstColorBalanceChannel", sizeof (GstColorBalanceChannel), 24},
{"GstColorBalanceClass", sizeof (GstColorBalanceClass), 44}, {"GstColorBalanceInterface", sizeof (GstColorBalanceInterface), 44},
{"GstDiscovererClass", sizeof (GstDiscovererClass), 96}, {"GstDiscovererClass", sizeof (GstDiscovererClass), 96},
{"GstDiscoverer", sizeof (GstDiscoverer), 32}, {"GstDiscoverer", sizeof (GstDiscoverer), 32},
{"GstFFTF32Complex", sizeof (GstFFTF32Complex), 8}, {"GstFFTF32Complex", sizeof (GstFFTF32Complex), 8},
@ -40,7 +40,7 @@ GstCheckABIStruct list[] = {
{"GstFFTS16", sizeof (GstFFTS16), 28}, {"GstFFTS16", sizeof (GstFFTS16), 28},
{"GstFFTS32Complex", sizeof (GstFFTS32Complex), 8}, {"GstFFTS32Complex", sizeof (GstFFTS32Complex), 8},
{"GstFFTS32", sizeof (GstFFTS32), 28}, {"GstFFTS32", sizeof (GstFFTS32), 28},
{"GstMixerClass", sizeof (GstMixerClass), 72}, {"GstMixerInterface", sizeof (GstMixerInterface), 72},
{"GstMixerOptionsClass", sizeof (GstMixerOptionsClass), 100}, {"GstMixerOptionsClass", sizeof (GstMixerOptionsClass), 100},
{"GstMixerOptions", sizeof (GstMixerOptions), 52}, {"GstMixerOptions", sizeof (GstMixerOptions), 52},
{"GstMixerTrackClass", sizeof (GstMixerTrackClass), 84}, {"GstMixerTrackClass", sizeof (GstMixerTrackClass), 84},
@ -82,7 +82,7 @@ GstCheckABIStruct list[] = {
{"GstTagDemux", sizeof (GstTagDemux), 148}, {"GstTagDemux", sizeof (GstTagDemux), 148},
{"GstTunerChannelClass", sizeof (GstTunerChannelClass), 92}, {"GstTunerChannelClass", sizeof (GstTunerChannelClass), 92},
{"GstTunerChannel", sizeof (GstTunerChannel), 40}, {"GstTunerChannel", sizeof (GstTunerChannel), 40},
{"GstTunerClass", sizeof (GstTunerClass), 76}, {"GstTunerInterface", sizeof (GstTunerInterface), 76},
{"GstTunerNormClass", sizeof (GstTunerNormClass), 84}, {"GstTunerNormClass", sizeof (GstTunerNormClass), 84},
{"GstTunerNorm", sizeof (GstTunerNorm), 36}, {"GstTunerNorm", sizeof (GstTunerNorm), 36},
{"GstVideoFilterClass", sizeof (GstVideoFilterClass), 376}, {"GstVideoFilterClass", sizeof (GstVideoFilterClass), 376},
@ -91,6 +91,6 @@ GstCheckABIStruct list[] = {
{"GstVideoRectangle", sizeof (GstVideoRectangle), 16}, {"GstVideoRectangle", sizeof (GstVideoRectangle), 16},
{"GstVideoSinkClass", sizeof (GstVideoSinkClass), 384}, {"GstVideoSinkClass", sizeof (GstVideoSinkClass), 384},
{"GstVideoSink", sizeof (GstVideoSink), 408}, {"GstVideoSink", sizeof (GstVideoSink), 408},
{"GstVideoOverlayIface", sizeof (GstVideoOverlayIface), 32}, {"GstVideoOverlayInterface", sizeof (GstVideoOverlayInterface), 32},
{NULL, 0, 0} {NULL, 0, 0}
}; };

8
tests/check/libs/struct_i386_osx.h
View file

@ -31,7 +31,7 @@ GstCheckABIStruct list[] = {
{"GstCddaBaseSrcTrack", sizeof (GstCddaBaseSrcTrack), 36}, {"GstCddaBaseSrcTrack", sizeof (GstCddaBaseSrcTrack), 36},
{"GstColorBalanceChannelClass", sizeof (GstColorBalanceChannelClass), 88}, {"GstColorBalanceChannelClass", sizeof (GstColorBalanceChannelClass), 88},
{"GstColorBalanceChannel", sizeof (GstColorBalanceChannel), 24}, {"GstColorBalanceChannel", sizeof (GstColorBalanceChannel), 24},
{"GstColorBalanceClass", sizeof (GstColorBalanceClass), 44}, {"GstColorBalanceInterface", sizeof (GstColorBalanceInterface), 44},
{"GstDiscovererClass", sizeof (GstDiscovererClass), 96}, {"GstDiscovererClass", sizeof (GstDiscovererClass), 96},
{"GstDiscoverer", sizeof (GstDiscoverer), 32}, {"GstDiscoverer", sizeof (GstDiscoverer), 32},
{"GstFFTF32Complex", sizeof (GstFFTF32Complex), 8}, {"GstFFTF32Complex", sizeof (GstFFTF32Complex), 8},
@ -42,7 +42,7 @@ GstCheckABIStruct list[] = {
{"GstFFTS16", sizeof (GstFFTS16), 28}, {"GstFFTS16", sizeof (GstFFTS16), 28},
{"GstFFTS32Complex", sizeof (GstFFTS32Complex), 8}, {"GstFFTS32Complex", sizeof (GstFFTS32Complex), 8},
{"GstFFTS32", sizeof (GstFFTS32), 28}, {"GstFFTS32", sizeof (GstFFTS32), 28},
{"GstMixerClass", sizeof (GstMixerClass), 72}, {"GstMixerInterface", sizeof (GstMixerInterface), 72},
{"GstMixerOptionsClass", sizeof (GstMixerOptionsClass), 100}, {"GstMixerOptionsClass", sizeof (GstMixerOptionsClass), 100},
{"GstMixerOptions", sizeof (GstMixerOptions), 52}, {"GstMixerOptions", sizeof (GstMixerOptions), 52},
{"GstMixerTrackClass", sizeof (GstMixerTrackClass), 84}, {"GstMixerTrackClass", sizeof (GstMixerTrackClass), 84},
@ -86,7 +86,7 @@ GstCheckABIStruct list[] = {
{"GstTagDemux", sizeof (GstTagDemux), 148}, {"GstTagDemux", sizeof (GstTagDemux), 148},
{"GstTunerChannelClass", sizeof (GstTunerChannelClass), 92}, {"GstTunerChannelClass", sizeof (GstTunerChannelClass), 92},
{"GstTunerChannel", sizeof (GstTunerChannel), 40}, {"GstTunerChannel", sizeof (GstTunerChannel), 40},
{"GstTunerClass", sizeof (GstTunerClass), 76}, {"GstTunerInterface", sizeof (GstTunerInterface), 76},
{"GstTunerNormClass", sizeof (GstTunerNormClass), 84}, {"GstTunerNormClass", sizeof (GstTunerNormClass), 84},
{"GstTunerNorm", sizeof (GstTunerNorm), 36}, {"GstTunerNorm", sizeof (GstTunerNorm), 36},
{"GstVideoFilterClass", sizeof (GstVideoFilterClass), 376}, {"GstVideoFilterClass", sizeof (GstVideoFilterClass), 376},
@ -95,6 +95,6 @@ GstCheckABIStruct list[] = {
{"GstVideoRectangle", sizeof (GstVideoRectangle), 16}, {"GstVideoRectangle", sizeof (GstVideoRectangle), 16},
{"GstVideoSinkClass", sizeof (GstVideoSinkClass), 384}, {"GstVideoSinkClass", sizeof (GstVideoSinkClass), 384},
{"GstVideoSink", sizeof (GstVideoSink), 408}, {"GstVideoSink", sizeof (GstVideoSink), 408},
{"GstVideoOverlayIface", sizeof (GstVideoOverlayIface), 32}, {"GstVideoOverlayInterface", sizeof (GstVideoOverlayInterface), 32},
{NULL, 0, 0} {NULL, 0, 0}
}; };

8
tests/check/libs/struct_x86_64.h
View file

@ -29,7 +29,7 @@ GstCheckABIStruct list[] = {
{"GstCddaBaseSrcTrack", sizeof (GstCddaBaseSrcTrack), 48}, {"GstCddaBaseSrcTrack", sizeof (GstCddaBaseSrcTrack), 48},
{"GstColorBalanceChannelClass", sizeof (GstColorBalanceChannelClass), 176}, {"GstColorBalanceChannelClass", sizeof (GstColorBalanceChannelClass), 176},
{"GstColorBalanceChannel", sizeof (GstColorBalanceChannel), 40}, {"GstColorBalanceChannel", sizeof (GstColorBalanceChannel), 40},
{"GstColorBalanceClass", sizeof (GstColorBalanceClass), 88}, {"GstColorBalanceInterface", sizeof (GstColorBalanceInterface), 88},
{"GstDiscovererClass", sizeof (GstDiscovererClass), 192}, {"GstDiscovererClass", sizeof (GstDiscovererClass), 192},
{"GstDiscoverer", sizeof (GstDiscoverer), 64}, {"GstDiscoverer", sizeof (GstDiscoverer), 64},
{"GstFFTF32Complex", sizeof (GstFFTF32Complex), 8}, {"GstFFTF32Complex", sizeof (GstFFTF32Complex), 8},
@ -40,7 +40,7 @@ GstCheckABIStruct list[] = {
{"GstFFTS16", sizeof (GstFFTS16), 48}, {"GstFFTS16", sizeof (GstFFTS16), 48},
{"GstFFTS32Complex", sizeof (GstFFTS32Complex), 8}, {"GstFFTS32Complex", sizeof (GstFFTS32Complex), 8},
{"GstFFTS32", sizeof (GstFFTS32), 48}, {"GstFFTS32", sizeof (GstFFTS32), 48},
{"GstMixerClass", sizeof (GstMixerClass), 144}, {"GstMixerInterface", sizeof (GstMixerInterface), 144},
{"GstMixerOptionsClass", sizeof (GstMixerOptionsClass), 200}, {"GstMixerOptionsClass", sizeof (GstMixerOptionsClass), 200},
{"GstMixerOptions", sizeof (GstMixerOptions), 88}, {"GstMixerOptions", sizeof (GstMixerOptions), 88},
{"GstMixerTrackClass", sizeof (GstMixerTrackClass), 168}, {"GstMixerTrackClass", sizeof (GstMixerTrackClass), 168},
@ -82,7 +82,7 @@ GstCheckABIStruct list[] = {
{"GstTagDemux", sizeof (GstTagDemux), 272}, {"GstTagDemux", sizeof (GstTagDemux), 272},
{"GstTunerChannelClass", sizeof (GstTunerChannelClass), 184}, {"GstTunerChannelClass", sizeof (GstTunerChannelClass), 184},
{"GstTunerChannel", sizeof (GstTunerChannel), 64}, {"GstTunerChannel", sizeof (GstTunerChannel), 64},
{"GstTunerClass", sizeof (GstTunerClass), 152}, {"GstTunerInterface", sizeof (GstTunerInterface), 152},
{"GstTunerNormClass", sizeof (GstTunerNormClass), 168}, {"GstTunerNormClass", sizeof (GstTunerNormClass), 168},
{"GstTunerNorm", sizeof (GstTunerNorm), 56}, {"GstTunerNorm", sizeof (GstTunerNorm), 56},
{"GstVideoFilterClass", sizeof (GstVideoFilterClass), 744}, {"GstVideoFilterClass", sizeof (GstVideoFilterClass), 744},
@ -91,6 +91,6 @@ GstCheckABIStruct list[] = {
{"GstVideoRectangle", sizeof (GstVideoRectangle), 16}, {"GstVideoRectangle", sizeof (GstVideoRectangle), 16},
{"GstVideoSinkClass", sizeof (GstVideoSinkClass), 760}, {"GstVideoSinkClass", sizeof (GstVideoSinkClass), 760},
{"GstVideoSink", sizeof (GstVideoSink), 640}, {"GstVideoSink", sizeof (GstVideoSink), 640},
{"GstVideoOverlayIface", sizeof (GstVideoOverlayIface), 64}, {"GstVideoOverlayInterface", sizeof (GstVideoOverlayInterface), 64},
{NULL, 0, 0} {NULL, 0, 0}
}; };