[vlc-commits] directfb: inline CloseDisplay

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Apr 18 10:17:04 2014 +0200| [00c7be60c4f600b3d13163588efae1c6e0406dc9] | committer: Rafaël Carré

directfb: inline CloseDisplay

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

 modules/video_output/directfb.c |   24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/modules/video_output/directfb.c b/modules/video_output/directfb.c
index 1d70b53..e5fa678 100644
--- a/modules/video_output/directfb.c
+++ b/modules/video_output/directfb.c
@@ -63,7 +63,6 @@ static void           Manage (vout_display_t *);
 
 /* */
 static int  OpenDisplay (vout_display_t *);
-static void CloseDisplay(vout_display_t *);
 
 /* */
 struct vout_display_sys_t {
@@ -180,7 +179,14 @@ static void Close(vlc_object_t *object)
     if (sys->pool)
         picture_pool_Delete(sys->pool);
 
-    CloseDisplay(vd);
+    IDirectFBSurface *primary = sys->primary;
+    if (primary)
+        primary->Release(primary);
+
+    IDirectFB *directfb = sys->directfb;
+    if (directfb)
+        directfb->Release(directfb);
+
     free(sys);
 }
 
@@ -272,17 +278,3 @@ static int OpenDisplay(vout_display_t *vd)
 
     return VLC_SUCCESS;
 }
-
-static void CloseDisplay(vout_display_t *vd)
-{
-    vout_display_sys_t *sys = vd->sys;
-
-    IDirectFBSurface *primary = sys->primary;
-    if (primary)
-        primary->Release(primary);
-
-    IDirectFB *directfb = sys->directfb;
-    if (directfb)
-        directfb->Release(directfb);
-}
-