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

8 files changed, 15 insertions, 15 deletions

diff --git a/docs/libs/gst-plugins-bad-libs-sections.txt b/docs/libs/gst-plugins-bad-libs-sections.txt
index 7976c2577..bc424db1a 100644
--- a/docs/libs/gst-plugins-bad-libs-sections.txt
+++ b/docs/libs/gst-plugins-bad-libs-sections.txt
@@ -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>
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index d7fc96e95..4e9ec0b88 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -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>
 
diff --git a/ext/apexsink/gstapexsink.c b/ext/apexsink/gstapexsink.c
index fc64db83a..9dec7bd6e 100644
--- a/ext/apexsink/gstapexsink.c
+++ b/ext/apexsink/gstapexsink.c
@@ -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;
 
diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c
index c32d27af0..038e3ee33 100644
--- a/ext/directfb/dfbvideosink.c
+++ b/ext/directfb/dfbvideosink.c
@@ -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;
diff --git a/gst-libs/gst/interfaces/photography.c b/gst-libs/gst/interfaces/photography.c
index d20684328..11f0e71d8 100644
--- a/gst-libs/gst/interfaces/photography.c
+++ b/gst-libs/gst/interfaces/photography.c
@@ -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);
   }
diff --git a/gst-libs/gst/interfaces/photography.h b/gst-libs/gst/interfaces/photography.h
index 206729a2f..21a4a5086 100644
--- a/gst-libs/gst/interfaces/photography.h
+++ b/gst-libs/gst/interfaces/photography.h
@@ -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))
 
 
diff --git a/gst/camerabin/gstcamerabincolorbalance.c b/gst/camerabin/gstcamerabincolorbalance.c
index 73a325d35..54899fabf 100644
--- a/gst/camerabin/gstcamerabincolorbalance.c
+++ b/gst/camerabin/gstcamerabincolorbalance.c
@@ -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;
diff --git a/gst/camerabin/gstcamerabincolorbalance.h b/gst/camerabin/gstcamerabincolorbalance.h
index 442a23bc9..81984e7f3 100644
--- a/gst/camerabin/gstcamerabincolorbalance.h
+++ b/gst/camerabin/gstcamerabincolorbalance.h
@@ -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__ */