Add missing rpath

[vlc] / modules / video_output / ios2.m

diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index 13e90991513deb560bc20c4a4fb3d94dd1a386db..c7b9e5bf179a1002a1df8737b686388b90a33f52 100644 (file)
--- 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];
@@ -159,14 +161,13 @@ static int Open(vlc_object_t *this)
     /* add tap gesture recognizer for DVD menus and stuff */
     sys->tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:sys->glESView
                                                                  action:@selector(tapRecognized:)];
-    sys->tapRecognizer.numberOfTapsRequired = 2;
     if (sys->viewContainer.window) {
         if (sys->viewContainer.window.rootViewController) {
             if (sys->viewContainer.window.rootViewController.view)
                 [sys->viewContainer.superview addGestureRecognizer:sys->tapRecognizer];
         }
     }
-    sys->tapRecognizer.cancelsTouchesInView = NO;
+    sys->tapRecognizer.cancelsTouchesInView = YES;
 
     /* Initialize common OpenGL video display */
     sys->gl.lock = OpenglESClean;
@@ -231,7 +232,7 @@ void Close (vlc_object_t *this)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->tapRecognizer) {
-        [sys->glESView removeGestureRecognizer:sys->tapRecognizer];
+        [sys->tapRecognizer.view removeGestureRecognizer:sys->tapRecognizer];
         [sys->tapRecognizer release];
     }
 
@@ -263,8 +264,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
         case VOUT_DISPLAY_HIDE_MOUSE:
             return VLC_EGENERIC;
 
-        case VOUT_DISPLAY_CHANGE_FULLSCREEN:
-        case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
         case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
         case VOUT_DISPLAY_CHANGE_ZOOM:
         case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
@@ -315,17 +314,11 @@ static int Control(vout_display_t *vd, int query, va_list ap)
             return VLC_SUCCESS;
         }
 
-        case VOUT_DISPLAY_GET_OPENGL:
-        {
-            vlc_gl_t **gl = va_arg(ap, vlc_gl_t **);
-            *gl = &sys->gl;
-            return VLC_SUCCESS;
-        }
-
         case VOUT_DISPLAY_RESET_PICTURES:
             assert (0);
         default:
             msg_Err(vd, "Unknown request %d", query);
+        case VOUT_DISPLAY_CHANGE_FULLSCREEN:
             return VLC_EGENERIC;
     }
 }