Only add _display suffix to open & close members because they could be #define to...

diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.c b/gst-libs/gst/vaapi/gstvaapidisplay.c
index 0193681..314bf38 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapidisplay.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.c
@@ -461,8 +461,8 @@ gst_vaapi_display_class_init(GstVaapiDisplayClass *klass)
     object_class->get_property  = gst_vaapi_display_get_property;
     object_class->constructed   = gst_vaapi_display_constructed;
 
-    dpy_class->lock_display     = gst_vaapi_display_lock_default;
-    dpy_class->unlock_display   = gst_vaapi_display_unlock_default;
+    dpy_class->lock             = gst_vaapi_display_lock_default;
+    dpy_class->unlock           = gst_vaapi_display_unlock_default;
 
     g_object_class_install_property
         (object_class,
@@ -545,8 +545,8 @@ gst_vaapi_display_lock(GstVaapiDisplay *display)
     g_return_if_fail(GST_VAAPI_IS_DISPLAY(display));
 
     klass = GST_VAAPI_DISPLAY_GET_CLASS(display);
-    if (klass->lock_display)
-        klass->lock_display(display);
+    if (klass->lock)
+        klass->lock(display);
 }
 
 /**
@@ -565,8 +565,8 @@ gst_vaapi_display_unlock(GstVaapiDisplay *display)
     g_return_if_fail(GST_VAAPI_IS_DISPLAY(display));
 
     klass = GST_VAAPI_DISPLAY_GET_CLASS(display);
-    if (klass->unlock_display)
-        klass->unlock_display(display);
+    if (klass->unlock)
+        klass->unlock(display);
 }
 
 /**

diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.h b/gst-libs/gst/vaapi/gstvaapidisplay.h
index 1dddf59..1147d00 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapidisplay.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.h
@@ -103,8 +103,8 @@ struct _GstVaapiDisplay {
  * GstVaapiDisplayClass:
  * @open_display: virtual function to open a display
  * @close_display: virtual function to close a display
- * @lock_display: virtual function to lock a display
- * @unlock_display: virtual function to unlock a display
+ * @lock: virtual function to lock a display
+ * @unlock: virtual function to unlock a display
  * @get_display: virtual function to retrieve the #VADisplay
  * @get_size: virtual function to retrieve the display dimensions, in pixels
  * @get_size_mm: virtual function to retrieve the display dimensions, in millimeters
@@ -118,8 +118,8 @@ struct _GstVaapiDisplayClass {
     /*< public >*/
     gboolean   (*open_display)  (GstVaapiDisplay *display);
     void       (*close_display) (GstVaapiDisplay *display);
-    void       (*lock_display)  (GstVaapiDisplay *display);
-    void       (*unlock_display)(GstVaapiDisplay *display);
+    void       (*lock)          (GstVaapiDisplay *display);
+    void       (*unlock)        (GstVaapiDisplay *display);
     VADisplay  (*get_display)   (GstVaapiDisplay *display);
     void       (*get_size)      (GstVaapiDisplay *display,
                                  guint *pwidth, guint *pheight);