[vlc-commits] gl: rename vlc_gl_Destroy to vlc_gl_Release

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Sun Sep 24 12:54:41 2017 +0200| [32a71f7d821753615a606114e8d388dc46c6acbc] | committer: Thomas Guillem

gl: rename vlc_gl_Destroy to vlc_gl_Release

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=32a71f7d821753615a606114e8d388dc46c6acbc
---

 include/vlc_opengl.h                   | 2 +-
 modules/video_output/android/display.c | 2 +-
 modules/video_output/opengl/display.c  | 4 ++--
 src/libvlccore.sym                     | 2 +-
 src/video_output/opengl.c              | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/vlc_opengl.h b/include/vlc_opengl.h
index a95fe5b377..8e53a8a7fa 100644
--- a/include/vlc_opengl.h
+++ b/include/vlc_opengl.h
@@ -77,7 +77,7 @@ enum {
 };
 
 VLC_API vlc_gl_t *vlc_gl_Create(struct vout_window_t *, unsigned, const char *) VLC_USED;
-VLC_API void vlc_gl_Destroy(vlc_gl_t *);
+VLC_API void vlc_gl_Release(vlc_gl_t *);
 VLC_API void vlc_gl_Hold(vlc_gl_t *);
 
 static inline int vlc_gl_MakeCurrent(vlc_gl_t *gl)
diff --git a/modules/video_output/android/display.c b/modules/video_output/android/display.c
index 574e91a579..1d4e774913 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -817,7 +817,7 @@ static void ClearSurface(vout_display_t *vd)
         vlc_gl_ReleaseCurrent(gl);
 
 end:
-        vlc_gl_Destroy(gl);
+        vlc_gl_Release(gl);
     }
     else
     {
diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c
index 54d23c0d28..ceb5ea204f 100644
--- a/modules/video_output/opengl/display.c
+++ b/modules/video_output/opengl/display.c
@@ -165,7 +165,7 @@ static int Open (vlc_object_t *obj)
 
 error:
     if (sys->gl != NULL)
-        vlc_gl_Destroy (sys->gl);
+        vlc_gl_Release (sys->gl);
     if (surface != NULL)
         vout_display_DeleteWindow (vd, surface);
     free (sys);
@@ -186,7 +186,7 @@ static void Close (vlc_object_t *obj)
     vout_display_opengl_Delete (sys->vgl);
     vlc_gl_ReleaseCurrent (gl);
 
-    vlc_gl_Destroy (gl);
+    vlc_gl_Release (gl);
     vout_display_DeleteWindow (vd, surface);
     free (sys);
 }
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 543ec26cd1..5b1a8bfee8 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -690,7 +690,7 @@ vlc_fifo_DequeueAllUnlocked
 vlc_fifo_GetCount
 vlc_fifo_GetBytes
 vlc_gl_Create
-vlc_gl_Destroy
+vlc_gl_Release
 vlc_gl_Hold
 vlc_gl_surface_Create
 vlc_gl_surface_CheckSize
diff --git a/src/video_output/opengl.c b/src/video_output/opengl.c
index 9a9413e4fc..c9dcdab57b 100644
--- a/src/video_output/opengl.c
+++ b/src/video_output/opengl.c
@@ -88,7 +88,7 @@ void vlc_gl_Hold(vlc_gl_t *gl)
     atomic_fetch_add(&glpriv->ref_count, 1);
 }
 
-void vlc_gl_Destroy(vlc_gl_t *gl)
+void vlc_gl_Release(vlc_gl_t *gl)
 {
     struct vlc_gl_priv_t *glpriv = (struct vlc_gl_priv_t *)gl;
     if (atomic_fetch_sub(&glpriv->ref_count, 1) != 1)
@@ -193,7 +193,7 @@ void vlc_gl_surface_Destroy(vlc_gl_t *gl)
     vout_window_t *surface = gl->surface;
     vlc_gl_surface_t *sys = surface->owner.sys;
 
-    vlc_gl_Destroy(gl);
+    vlc_gl_Release(gl);
     vout_window_Delete(surface);
     vlc_mutex_destroy(&sys->lock);
     free(sys);