瀏覽代碼

local network: require iOS 7 for SAP discovery (closes #10081)

Felix Paul Kühne 11 年之前
父節點
當前提交
408c43e822
共有 2 個文件被更改,包括 11 次插入2 次删除
  1. 1 1
      NEWS
  2. 10 1
      Sources/VLCLocalServerListViewController.m

+ 1 - 1
NEWS

@@ -33,7 +33,7 @@ Local network:
 * Added cover-art and duration to UPnP server item lists
 * UPnP stability improvements
 * Added support for media broadcasted with the Session Announcement Protocol
-  (SAP) information on the local network (#9429)
+  (SAP) information on the local network. Requires iOS 7 or later. (#9429)
 * Fix incorrect displayed size for files stored on UPnP multimedia servers
   larger than 2147.48 MB (#9641)
 * Improved WiFi Upload reliability, especially when uploading multiple

+ 10 - 1
Sources/VLCLocalServerListViewController.m

@@ -71,7 +71,10 @@
 {
     [super viewDidLoad];
 
-    _sectionHeaderTexts = @[@"Universal Plug'n'Play (UPNP)", @"File Transfer Protocol (FTP)", @"Network Streams (SAP)"];
+    if (SYSTEM_RUNS_IOS7_OR_LATER)
+        _sectionHeaderTexts = @[@"Universal Plug'n'Play (UPNP)", @"File Transfer Protocol (FTP)", @"Network Streams (SAP)"];
+    else
+        _sectionHeaderTexts = @[@"Universal Plug'n'Play (UPNP)", @"File Transfer Protocol (FTP)"];
 
     _backToMenuButton = [UIBarButtonItem themedRevealMenuButtonWithTarget:self andSelector:@selector(goBack:)];
     self.navigationItem.leftBarButtonItem = _backToMenuButton;
@@ -401,12 +404,18 @@
 
 - (void)_startSAPDiscovery
 {
+    if (!SYSTEM_RUNS_IOS7_OR_LATER)
+        return;
+
     _sapDiscoverer = [[VLCMediaDiscoverer alloc] initWithName:@"sap"];
     _sapDiscoverer.discoveredMedia.delegate = self;
 }
 
 - (void)_stopSAPDiscovery
 {
+    if (!SYSTEM_RUNS_IOS7_OR_LATER)
+        return;
+
     _sapDiscoverer = nil;
 }