소스 검색

Fixed UPnP playback on iOS 7

(cherry picked from commit 386a3abf3751cc9f80a1f805481d3376aca8718e)
Felix Paul Kühne 9 년 전
부모
커밋
d3760f8b0d
2개의 변경된 파일15개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 0
      NEWS
  2. 13 4
      SharedSources/ServerBrowsing/UPnP/VLCNetworkServerBrowserUPnP.m

+ 2 - 0
NEWS

@@ -4,6 +4,8 @@
 * Improved HTTP connectivity
 * Improved UPnP reliability, notably with Twonky
 * Fixed issues unlocking the app when a passcode was never set
+* Fixed custom subtitles font sizes
+* Fixed UPnP playback on iOS 7
 
 2.7.1:
 ------

+ 13 - 4
SharedSources/ServerBrowsing/UPnP/VLCNetworkServerBrowserUPnP.m

@@ -243,10 +243,19 @@
                 if (evaluatedObject == nil || ![evaluatedObject isKindOfClass:[NSString class]])
                     return NO;
 
-                if ([evaluatedObject containsString:@"http-get:*:video/"])
-                    return YES;
-                if ([evaluatedObject containsString:@"http-get:*:audio/"])
-                    return YES;
+                if ([evaluatedObject respondsToSelector:@selector(containsString:)]) {
+                    if ([evaluatedObject containsString:@"http-get:*:video/"])
+                        return YES;
+                    if ([evaluatedObject containsString:@"http-get:*:audio/"])
+                        return YES;
+                } else {
+                    NSRange foundRange = [evaluatedObject rangeOfString:@"http-get:*:video/"];
+                    if (foundRange.location != NSNotFound)
+                        return YES;
+                    foundRange = [evaluatedObject rangeOfString:@"http-get:*:audio/"];
+                    if (foundRange.location != NSNotFound)
+                        return YES;
+                }
                 return NO;
             }]];
             /* FIXME: on some servers, we can have more than 1 protocol string as different transcoding schemes are offered