[vlc-commits] iOS: check that the vout is not windowed

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct 14 22:43:01 2014 +0300| [e04a1207ea85bbb8e43440e26d0c17f13f73e6e6] | committer: Rémi Denis-Courmont

iOS: check that the vout is not windowed

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

 modules/video_output/ios2.m |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index b90d693..feb2203 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -121,6 +121,10 @@ static void *OurGetProcAddress(vlc_gl_t *gl, const char *name)
 static int Open(vlc_object_t *this)
 {
     vout_display_t *vd = (vout_display_t *)this;
+
+    if (vout_display_IsWindowed(vd))
+        return VLC_EGENERIC;
+
     vout_display_sys_t *sys = calloc (1, sizeof(*sys));
     NSAutoreleasePool *autoreleasePool = nil;
 
@@ -138,8 +142,6 @@ static int Open(vlc_object_t *this)
     if (!viewContainer || ![viewContainer isKindOfClass:[UIView class]])
         goto bailout;
 
-    vout_display_DeleteWindow (vd, NULL);
-
     /* This will be released in Close(), on
      * main thread, after we are done using it. */
     sys->viewContainer = [viewContainer retain];