From 16bcb4b8c8a663394417e64d88a4ab5a9fa7d21d Mon Sep 17 00:00:00 2001
From: Hank Anderson <ataganak@gmail.com>
Date: Sun, 16 Oct 2022 17:10:35 +0900
Subject: [PATCH] VLCMedia: simplified initialization process for url
---
Sources/VLCMedia.m | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/Sources/VLCMedia.m b/Sources/VLCMedia.m
index 1f94378c..42a7d53e 100644
--- a/Sources/VLCMedia.m
+++ b/Sources/VLCMedia.m
@@ -623,21 +623,16 @@ static void HandleMediaParsedChanged(const libvlc_event_t * event, void * self)
if (!p_url)
return;
- NSString *urlString = [NSString stringWithUTF8String:p_url];
- if (!urlString) {
- free(p_url);
- return;
- }
-
- _url = [NSURL URLWithString:urlString];
- if (!_url) /* Attempt to interpret as a file path then */ {
- _url = [NSURL fileURLWithPath:urlString];
- if(!_url) {
- free(p_url);
- return;
- }
- }
+ NSString *urlString = @(p_url);
free(p_url);
+
+ if (!urlString)
+ return;
+
+ /* Attempt to interpret as a file path then */
+ _url = [NSURL URLWithString: urlString] ?: [NSURL fileURLWithPath: urlString];
+ if (!_url)
+ return;
libvlc_media_set_user_data(p_md, (__bridge void*)self);
--
GitLab