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

This commit is contained in:
Stefan Sauer 2011-10-21 15:04:05 +02:00
parent effab293cb
commit 69f8921e2c
8 changed files with 15 additions and 15 deletions

View file

@ -213,7 +213,7 @@ GST_PHOTOGRAPHY
GST_IS_PHOTOGRAPHY
GST_TYPE_PHOTOGRAPHY
gst_photography_get_type
GST_PHOTOGRAPHY_GET_IFACE
GST_PHOTOGRAPHY_GET_INTERFACE
</SECTION>
<SECTION>

View file

@ -1768,7 +1768,7 @@ gst_photography_get_config
<SUBSECTION Standard>
GST_PHOTOGRAPHY
GST_IS_PHOTOGRAPHY
GST_PHOTOGRAPHY_GET_IFACE
GST_PHOTOGRAPHY_GET_INTERFACE
gst_photography_get_type
</SECTION>

View file

@ -172,7 +172,7 @@ static GstStateChangeReturn gst_apexsink_change_state (GstElement * element,
static void gst_apexsink_interfaces_init (GType type);
static void gst_apexsink_implements_interface_init (GstImplementsInterfaceClass
* iface);
static void gst_apexsink_mixer_interface_init (GstMixerClass * iface);
static void gst_apexsink_mixer_interface_init (GstMixerInterface * iface);
static gboolean gst_apexsink_interface_supported (GstImplementsInterface *
iface, GType iface_type);
@ -208,7 +208,7 @@ gst_apexsink_implements_interface_init (GstImplementsInterfaceClass * iface)
}
static void
gst_apexsink_mixer_interface_init (GstMixerClass * iface)
gst_apexsink_mixer_interface_init (GstMixerInterface * iface)
{
GST_MIXER_TYPE (iface) = GST_MIXER_SOFTWARE;

View file

@ -2091,7 +2091,7 @@ gst_dfbvideosink_colorbalance_get_value (GstColorBalance * balance,
}
static void
gst_dfbvideosink_colorbalance_init (GstColorBalanceClass * iface)
gst_dfbvideosink_colorbalance_init (GstColorBalanceInterface * iface)
{
GST_COLOR_BALANCE_TYPE (iface) = GST_COLOR_BALANCE_HARDWARE;
iface->list_channels = gst_dfbvideosink_colorbalance_list_channels;

View file

@ -110,7 +110,7 @@ gst_photography_set_ ## function_name (GstPhotography * photo, param_type param)
{ \
GstPhotographyInterface *iface; \
g_return_val_if_fail (photo != NULL, FALSE); \
iface = GST_PHOTOGRAPHY_GET_IFACE (photo); \
iface = GST_PHOTOGRAPHY_GET_INTERFACE (photo); \
if (iface->set_ ## function_name) { \
return iface->set_ ## function_name (photo, param); \
} \
@ -121,7 +121,7 @@ gst_photography_get_ ## function_name (GstPhotography * photo, param_type * para
{ \
GstPhotographyInterface *iface; \
g_return_val_if_fail (photo != NULL, FALSE); \
iface = GST_PHOTOGRAPHY_GET_IFACE (photo); \
iface = GST_PHOTOGRAPHY_GET_INTERFACE (photo); \
if (iface->get_ ## function_name) { \
return iface->get_ ## function_name (photo, param); \
} \
@ -389,7 +389,7 @@ gst_photography_get_capabilities (GstPhotography * photo)
GstPhotographyInterface *iface;
g_return_val_if_fail (photo != NULL, GST_PHOTOGRAPHY_CAPS_NONE);
iface = GST_PHOTOGRAPHY_GET_IFACE (photo);
iface = GST_PHOTOGRAPHY_GET_INTERFACE (photo);
if (iface->get_capabilities) {
return iface->get_capabilities (photo);
} else {
@ -418,7 +418,7 @@ gst_photography_prepare_for_capture (GstPhotography * photo,
g_return_val_if_fail (photo != NULL, FALSE);
iface = GST_PHOTOGRAPHY_GET_IFACE (photo);
iface = GST_PHOTOGRAPHY_GET_INTERFACE (photo);
if (iface->prepare_for_capture) {
ret = iface->prepare_for_capture (photo, func, capture_caps, user_data);
}
@ -440,7 +440,7 @@ gst_photography_set_autofocus (GstPhotography * photo, gboolean on)
GstPhotographyInterface *iface;
g_return_if_fail (photo != NULL);
iface = GST_PHOTOGRAPHY_GET_IFACE (photo);
iface = GST_PHOTOGRAPHY_GET_INTERFACE (photo);
if (iface->set_autofocus) {
iface->set_autofocus (photo, on);
}
@ -463,7 +463,7 @@ gst_photography_set_config (GstPhotography * photo, GstPhotoSettings * config)
g_return_val_if_fail (photo != NULL, FALSE);
iface = GST_PHOTOGRAPHY_GET_IFACE (photo);
iface = GST_PHOTOGRAPHY_GET_INTERFACE (photo);
if (iface->set_config) {
ret = iface->set_config (photo, config);
}
@ -488,7 +488,7 @@ gst_photography_get_config (GstPhotography * photo, GstPhotoSettings * config)
g_return_val_if_fail (photo != NULL, FALSE);
iface = GST_PHOTOGRAPHY_GET_IFACE (photo);
iface = GST_PHOTOGRAPHY_GET_INTERFACE (photo);
if (iface->get_config) {
ret = iface->get_config (photo, config);
}

View file

@ -40,7 +40,7 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PHOTOGRAPHY, GstPhotography))
#define GST_IS_PHOTOGRAPHY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PHOTOGRAPHY))
#define GST_PHOTOGRAPHY_GET_IFACE(inst) \
#define GST_PHOTOGRAPHY_GET_INTERFACE(inst) \
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_PHOTOGRAPHY, GstPhotographyInterface))

View file

@ -71,7 +71,7 @@ gst_camerabin_color_balance_get_value (GstColorBalance * cb,
*/
void
gst_camerabin_color_balance_init (GstColorBalanceClass * iface)
gst_camerabin_color_balance_init (GstColorBalanceInterface * iface)
{
/* FIXME: to get the same type as v4l2src */
GST_COLOR_BALANCE_TYPE (iface) = GST_COLOR_BALANCE_HARDWARE;

View file

@ -23,6 +23,6 @@
#include <gst/interfaces/colorbalance.h>
extern void gst_camerabin_color_balance_init (GstColorBalanceClass * iface);
extern void gst_camerabin_color_balance_init (GstColorBalanceInterface * iface);
#endif /* #ifndef __GST_CAMERA_COLOR_BALANCE_H__ */