[vlc-commits] [Git][videolan/vlc][master] 3 commits: iosvlc: fix ViewController initialization

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
f5c2e565 by Alexandre Janniaux at 2024-05-28T09:09:13+00:00
iosvlc: fix ViewController initialization

With the latest available SDK, when run from the simulator, the current
code was failing with the following assertion:

    Assertion failure in UITraitCollection
    *UIViewControllerMissingInitialTraitCollection(UIViewController
    *__strong, UIApplicationSystemVersion)(), UIViewController.m:2749

- - - - -
8c0bb3de by Alexandre Janniaux at 2024-05-28T09:09:13+00:00
iosvlc: fix libvlc_InternalPlay call

libvlc_InternalPlay expects the vlccore internal libvlc object but the
libvlc public one was given instead, leading to crashes.

Missing from fae1ff402894c863dbd306bfd40bb1e10395ec85.

- - - - -
259d38b0 by Alexandre Janniaux at 2024-05-28T09:09:13+00:00
iosvlc: remove custom plugin path

The module bank will load the plugins from the correct location by
default since commit 89e90672db4a10243ae802c32272da8c062bc7bb.

- - - - -


1 changed file:

- test/iosvlc.m


Changes:

=====================================
test/iosvlc.m
=====================================
@@ -95,10 +95,6 @@
 /* Called after application launch */
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    /* Set VLC_PLUGIN_PATH for dynamic loading */
-    NSString *pluginsDirectory = [[NSBundle mainBundle] privateFrameworksPath];
-    setenv("VLC_PLUGIN_PATH", [pluginsDirectory UTF8String], 1);
-
     /* Store startup arguments to forward them to libvlc */
     NSArray *arguments = [[NSProcessInfo processInfo] arguments];
     unsigned vlc_argc = [arguments count] - 1;
@@ -118,7 +114,7 @@
 
     /* Initialize main window */
     window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
-    window.rootViewController = [UIViewController alloc];
+    window.rootViewController = [[UIViewController alloc] init];
     window.backgroundColor = [UIColor whiteColor];
 
     subview = [[UIView alloc] initWithFrame:window.bounds];
@@ -137,7 +133,7 @@
     libvlc_InternalAddIntf(_libvlc->p_libvlc_int, "ios_interface,none");
 
     /* Start parsing arguments and eventual playback */
-    libvlc_InternalPlay(_libvlc);
+    libvlc_InternalPlay(_libvlc->p_libvlc_int);
 
     return YES;
 }



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fc6b08e88a27fce1f5baa7dbf11180451b0a796b...259d38b084a8a4ebbe4f452f3cc0a77f98751738

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fc6b08e88a27fce1f5baa7dbf11180451b0a796b...259d38b084a8a4ebbe4f452f3cc0a77f98751738
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance