rename local network classes since those are no longer local

Resources/VLCLocalNetworkListCell~ipad.xib

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5037.3" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8121.17" systemVersion="14E33b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1552" identifier="iOS"/>
         <development version="5000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8101.14"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleAspectFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="LocalNetworkCell" rowHeight="76" id="3" customClass="VLCLocalNetworkListCell">
+        <tableViewCell contentMode="scaleAspectFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="LocalNetworkCell" rowHeight="76" id="3" customClass="VLCNetworkListCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3" id="vO8-D6-6WE">

Resources/VLCLocalNetworkListCell~iphone.xib

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4514" systemVersion="13B3116" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8121.17" systemVersion="14E33b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1552" identifier="iOS"/>
         <development version="5000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8101.14"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="LocalNetworkCell" rowHeight="44" id="3" customClass="VLCLocalNetworkListCell">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="LocalNetworkCell" rowHeight="44" id="3" customClass="VLCNetworkListCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3" id="qo4-sr-qnV">
@@ -82,4 +81,4 @@
     <resources>
         <image name="download.png" width="32" height="32"/>
     </resources>
-</document>
+</document>

Sources/VLCFTPServerListViewController.h

@@ -10,9 +10,9 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import "VLCLocalNetworkListViewController.h"
+#import "VLCNetworkListViewController.h"
 
-@interface VLCFTPServerListViewController : VLCLocalNetworkListViewController
+@interface VLCFTPServerListViewController : VLCNetworkListViewController
 
 - (id)initWithFTPServer:(NSString *)serverAddress userName:(NSString *)username andPassword:(NSString *)password atPath:(NSString *)path;
 

Sources/VLCFTPServerListViewController.m

@@ -12,7 +12,7 @@
  *****************************************************************************/
 
 #import "VLCFTPServerListViewController.h"
-#import "VLCLocalNetworkListCell.h"
+#import "VLCNetworkListCell.h"
 #import "VLCAppDelegate.h"
 #import "NSString+SupportedMedia.h"
 #import "UIDevice+VLC.h"
@@ -185,9 +185,9 @@
 {
     static NSString *CellIdentifier = @"LocalNetworkCellDetail";
 
-    VLCLocalNetworkListCell *cell = (VLCLocalNetworkListCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    VLCNetworkListCell *cell = (VLCNetworkListCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
     if (cell == nil)
-        cell = [VLCLocalNetworkListCell cellWithReuseIdentifier:CellIdentifier];
+        cell = [VLCNetworkListCell cellWithReuseIdentifier:CellIdentifier];
 
 
     NSDictionary *cellObject;
@@ -217,7 +217,7 @@
 
 #pragma mark - table view delegate, for more see super
 
-- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCLocalNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
     [super tableView:tableView willDisplayCell:cell forRowAtIndexPath:indexPath];
 
@@ -258,7 +258,7 @@
 }
 
 #pragma mark - VLCLocalNetworkListCell delegation
-- (void)triggerDownloadForCell:(VLCLocalNetworkListCell *)cell
+- (void)triggerDownloadForCell:(VLCNetworkListCell *)cell
 {
     NSString *rawObjectName;
     NSInteger size;

Sources/VLCLocalPlexFolderListViewController.m

@@ -14,7 +14,7 @@
 #import "VLCPlexMediaInformationViewController.h"
 #import "VLCPlexParser.h"
 #import "VLCPlexWebAPI.h"
-#import "VLCLocalNetworkListCell.h"
+#import "VLCNetworkListCell.h"
 #import "VLCAppDelegate.h"
 #import "VLCPlaylistViewController.h"
 #import "VLCDownloadViewController.h"
@@ -183,10 +183,10 @@
 {
     static NSString *CellIdentifier = @"PlexCellDetail";
 
-    VLCLocalNetworkListCell *cell = (VLCLocalNetworkListCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    VLCNetworkListCell *cell = (VLCNetworkListCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
 
     if (cell == nil)
-        cell = [VLCLocalNetworkListCell cellWithReuseIdentifier:CellIdentifier];
+        cell = [VLCNetworkListCell cellWithReuseIdentifier:CellIdentifier];
 
     NSDictionary *cellObject;
 
@@ -250,7 +250,7 @@
 
 #pragma mark - Table view delegate
 
-- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCLocalNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
     UIColor *color = (indexPath.row % 2 == 0)? [UIColor blackColor]: [UIColor VLCDarkBackgroundColor];
     cell.contentView.backgroundColor = cell.titleLabel.backgroundColor = cell.folderTitleLabel.backgroundColor = cell.subtitleLabel.backgroundColor =  color;
@@ -358,7 +358,7 @@
     NSIndexPath *swipedIndexPath = [self.tableView indexPathForRowAtPoint:[recognizer locationInView:self.tableView]];
     UITableViewCell *swipedCell = [self.tableView cellForRowAtIndexPath:swipedIndexPath];
 
-    VLCLocalNetworkListCell *cell = (VLCLocalNetworkListCell *)[[self tableView] cellForRowAtIndexPath:swipedIndexPath];
+    VLCNetworkListCell *cell = (VLCNetworkListCell *)[[self tableView] cellForRowAtIndexPath:swipedIndexPath];
 
     NSDictionary *cellObject = _globalObjectList[[self.tableView indexPathForCell:swipedCell].row];
 
@@ -392,7 +392,7 @@
 
 #pragma mark - VLCLocalNetworkListCell delegation
 
-- (void)triggerDownloadForCell:(VLCLocalNetworkListCell *)cell
+- (void)triggerDownloadForCell:(VLCNetworkListCell *)cell
 {
     NSDictionary *cellObject;
 

Sources/VLCMenuTableViewController.m

@@ -24,7 +24,7 @@
 #import "VLCAppDelegate.h"
 #import "HTTPServer.h"
 #import "IASKAppSettingsViewController.h"
-#import "VLCLocalServerListViewController.h"
+#import "VLCServerListViewController.h"
 #import "VLCOpenNetworkStreamViewController.h"
 #import "VLCSettingsController.h"
 #import "VLCAboutViewController.h"
@@ -292,7 +292,7 @@
     VLCAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
     if (sectionNumber == 1) {
         if (itemIndex == 0)
-            viewController = [[VLCLocalServerListViewController alloc] init];
+            viewController = [[VLCServerListViewController alloc] init];
         else if (itemIndex == 1) {
             viewController = [[VLCOpenNetworkStreamViewController alloc] initWithNibName:@"VLCOpenNetworkStreamViewController" bundle:nil];
         } else if (itemIndex == 2)

Sources/VLCLocalNetworkListCell.h

@@ -14,7 +14,7 @@
 
 @class VLCStatusLabel;
 
-@interface VLCLocalNetworkListCell : UITableViewCell
+@interface VLCNetworkListCell : UITableViewCell
 
 @property (nonatomic, weak) id delegate;
 
@@ -35,7 +35,7 @@
 @property (nonatomic, retain) NSURL *iconURL;
 @property (nonatomic, readwrite) BOOL isDownloadable;
 
-+ (VLCLocalNetworkListCell *)cellWithReuseIdentifier:(NSString *)ident;
++ (VLCNetworkListCell *)cellWithReuseIdentifier:(NSString *)ident;
 + (CGFloat)heightOfCell;
 
 - (IBAction)triggerDownload:(id)sender;

Sources/VLCLocalNetworkListCell.m

@@ -11,18 +11,18 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import "VLCLocalNetworkListCell.h"
+#import "VLCNetworkListCell.h"
 
 #import "VLCStatusLabel.h"
 
-@implementation VLCLocalNetworkListCell
+@implementation VLCNetworkListCell
 
-+ (VLCLocalNetworkListCell *)cellWithReuseIdentifier:(NSString *)ident
++ (VLCNetworkListCell *)cellWithReuseIdentifier:(NSString *)ident
 {
-    NSArray *nibContentArray = [[NSBundle mainBundle] loadNibNamed:@"VLCLocalNetworkListCell" owner:nil options:nil];
+    NSArray *nibContentArray = [[NSBundle mainBundle] loadNibNamed:@"VLCNetworkListCell" owner:nil options:nil];
     NSAssert([nibContentArray count] == 1, @"meh");
-    NSAssert([[nibContentArray lastObject] isKindOfClass:[VLCLocalNetworkListCell class]], @"meh meh");
-    VLCLocalNetworkListCell *cell = (VLCLocalNetworkListCell *)[nibContentArray lastObject];
+    NSAssert([[nibContentArray lastObject] isKindOfClass:[VLCNetworkListCell class]], @"meh meh");
+    VLCNetworkListCell *cell = (VLCNetworkListCell *)[nibContentArray lastObject];
 
     return cell;
 }

Sources/VLCLocalNetworkListViewController.h

@@ -10,12 +10,12 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-@class VLCLocalNetworkListCell;
+@class VLCNetworkListCell;
 
-@interface VLCLocalNetworkListViewController : UIViewController
+@interface VLCNetworkListViewController : UIViewController
 
 @property (nonatomic, strong) UITableView *tableView;
 
-- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCLocalNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
+- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
 
 @end

Sources/VLCLocalNetworkListViewController.m

@@ -11,10 +11,10 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import "VLCLocalNetworkListViewController.h"
-#import "VLCLocalNetworkListCell.h"
+#import "VLCNetworkListViewController.h"
+#import "VLCNetworkListCell.h"
 
-@interface VLCLocalNetworkListViewController () <UITableViewDataSource, UITableViewDelegate, UISearchBarDelegate, UISearchDisplayDelegate>
+@interface VLCNetworkListViewController () <UITableViewDataSource, UITableViewDelegate, UISearchBarDelegate, UISearchDisplayDelegate>
 {
     NSMutableArray *_searchData;
     UISearchBar *_searchBar;
@@ -23,7 +23,7 @@
 
 @end
 
-@implementation VLCLocalNetworkListViewController
+@implementation VLCNetworkListViewController
 
 - (void)loadView
 {
@@ -105,7 +105,7 @@
 
 #pragma mark - Table view delegate
 
-- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCLocalNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
     UIColor *color = (indexPath.row % 2 == 0)? [UIColor blackColor]: [UIColor VLCDarkBackgroundColor];
     cell.contentView.backgroundColor = cell.titleLabel.backgroundColor = cell.folderTitleLabel.backgroundColor = cell.subtitleLabel.backgroundColor =  color;

Sources/VLCLocalServerListViewController.h

@@ -13,7 +13,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface VLCLocalServerListViewController : UIViewController
+@interface VLCServerListViewController : UIViewController
 
 @property (nonatomic, strong) UITableView *tableView;
 

Sources/VLCLocalServerListViewController.m

@@ -12,10 +12,10 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import "VLCLocalServerListViewController.h"
+#import "VLCServerListViewController.h"
 #import "VLCAppDelegate.h"
 #import "UPnPManager.h"
-#import "VLCLocalNetworkListCell.h"
+#import "VLCNetworkListCell.h"
 
 #import "VLCLocalPlexFolderListViewController.h"
 #import "VLCPlexConnectServerViewController.h"
@@ -33,7 +33,7 @@
 
 #define kPlexServiceType @"_plexmediasvr._tcp."
 
-@interface VLCLocalServerListViewController () <UITableViewDataSource, UITableViewDelegate, NSNetServiceBrowserDelegate, VLCNetworkLoginViewController, NSNetServiceDelegate, VLCMediaListDelegate, UPnPDBObserver>
+@interface VLCServerListViewController () <UITableViewDataSource, UITableViewDelegate, NSNetServiceBrowserDelegate, VLCNetworkLoginViewController, NSNetServiceDelegate, VLCMediaListDelegate, UPnPDBObserver>
 {
     UIBarButtonItem *_backToMenuButton;
     NSArray *_sectionHeaderTexts;
@@ -69,7 +69,7 @@
 
 @end
 
-@implementation VLCLocalServerListViewController
+@implementation VLCServerListViewController
 
 - (void)dealloc
 {
@@ -304,7 +304,7 @@
     return 0;
 }
 
-- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCLocalNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
     UIColor *color = (indexPath.row % 2 == 0)? [UIColor blackColor]: [UIColor VLCDarkBackgroundColor];
     cell.contentView.backgroundColor = cell.titleLabel.backgroundColor = cell.folderTitleLabel.backgroundColor = cell.subtitleLabel.backgroundColor = color;
@@ -314,9 +314,9 @@
 {
     static NSString *CellIdentifier = @"LocalNetworkCell";
 
-    VLCLocalNetworkListCell *cell = (VLCLocalNetworkListCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    VLCNetworkListCell *cell = (VLCNetworkListCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
     if (cell == nil)
-        cell = [VLCLocalNetworkListCell cellWithReuseIdentifier:CellIdentifier];
+        cell = [VLCNetworkListCell cellWithReuseIdentifier:CellIdentifier];
 
     NSUInteger row = indexPath.row;
     NSUInteger section = indexPath.section;

Sources/VLCSharedLibraryListViewController.m

@@ -12,7 +12,7 @@
 
 #import "VLCSharedLibraryListViewController.h"
 #import "VLCSharedLibraryParser.h"
-#import "VLCLocalNetworkListCell.h"
+#import "VLCNetworkListCell.h"
 #import "VLCAppDelegate.h"
 #import "VLCPlaylistViewController.h"
 #import "VLCDownloadViewController.h"
@@ -146,7 +146,7 @@
 {
     static NSString *CellIdentifier = @"libraryVLCCellDetail";
 
-    VLCLocalNetworkListCell *cell = (VLCLocalNetworkListCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    VLCLocalNetworkListCell *cell = (VLCNetworkListCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
 
     if (cell == nil)
         cell = [VLCLocalNetworkListCell cellWithReuseIdentifier:CellIdentifier];
@@ -203,7 +203,7 @@
 
 #pragma mark - Table view delegate
 
-- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCLocalNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+- (void)tableView:(UITableView *)tableView willDisplayCell:(VLCNetworkListCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
     UIColor *color = (indexPath.row % 2 == 0)? [UIColor blackColor]: [UIColor VLCDarkBackgroundColor];
     cell.contentView.backgroundColor = cell.titleLabel.backgroundColor = cell.folderTitleLabel.backgroundColor = cell.subtitleLabel.backgroundColor =  color;
@@ -298,7 +298,7 @@
 
 #pragma mark - VLCLocalNetworkListCell delegation
 
-- (void)triggerDownloadForCell:(VLCLocalNetworkListCell *)cell
+- (void)triggerDownloadForCell:(VLCNetworkListCell *)cell
 {
     NSDictionary *dataItem;
 

Sources/VLCUPnPServerListViewController.h

@@ -10,11 +10,11 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import "VLCLocalNetworkListViewController.h"
+#import "VLCNetworkListViewController.h"
 
 @class MediaServer1Device;
 
-@interface VLCUPnPServerListViewController : VLCLocalNetworkListViewController
+@interface VLCUPnPServerListViewController : VLCNetworkListViewController
 
 - (id)initWithUPNPDevice:(MediaServer1Device *)device header:(NSString *)header andRootID:(NSString *)rootID;
 

Sources/VLCUPnPServerListViewController.m

@@ -14,7 +14,7 @@
 
 #import "VLCUPnPServerListViewController.h"
 
-#import "VLCLocalNetworkListCell.h"
+#import "VLCNetworkListCell.h"
 #import "VLCAppDelegate.h"
 #import "VLCStatusLabel.h"
 #import "NSString+SupportedMedia.h"
@@ -111,9 +111,9 @@
 {
     static NSString *CellIdentifier = @"LocalNetworkCellDetail";
 
-    VLCLocalNetworkListCell *cell = (VLCLocalNetworkListCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+    VLCNetworkListCell *cell = (VLCNetworkListCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
     if (cell == nil)
-        cell = [VLCLocalNetworkListCell cellWithReuseIdentifier:CellIdentifier];
+        cell = [VLCNetworkListCell cellWithReuseIdentifier:CellIdentifier];
 
     MediaServer1BasicObject *item;
     if (tableView == self.searchDisplayController.searchResultsTableView) {
@@ -274,7 +274,7 @@
 }
 
 #pragma mark - VLCLocalNetworkListCell delegation
-- (void)triggerDownloadForCell:(VLCLocalNetworkListCell *)cell
+- (void)triggerDownloadForCell:(VLCNetworkListCell *)cell
 {
     MediaServer1ItemObject *item;
     if ([self.searchDisplayController isActive]) {

VLC for iOS.xcodeproj/project.pbxproj

@@ -93,8 +93,8 @@
 		7D30F3CA183AB27A00FFC021 /* VLCDownloadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3C9183AB27A00FFC021 /* VLCDownloadViewController.m */; };
 		7D30F3CD183AB29300FFC021 /* VLCMenuTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3CC183AB29300FFC021 /* VLCMenuTableViewController.m */; };
 		7D30F3D0183AB2AC00FFC021 /* VLCMediaFileDiscoverer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3CF183AB2AC00FFC021 /* VLCMediaFileDiscoverer.m */; };
-		7D30F3D7183AB2F100FFC021 /* VLCLocalNetworkListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3D2183AB2F100FFC021 /* VLCLocalNetworkListCell.m */; };
-		7D30F3D9183AB2F100FFC021 /* VLCLocalServerListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3D6183AB2F100FFC021 /* VLCLocalServerListViewController.m */; };
+		7D30F3D7183AB2F100FFC021 /* VLCNetworkListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3D2183AB2F100FFC021 /* VLCNetworkListCell.m */; };
+		7D30F3D9183AB2F100FFC021 /* VLCServerListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3D6183AB2F100FFC021 /* VLCServerListViewController.m */; };
 		7D30F3DC183AB2F900FFC021 /* VLCNetworkLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3DB183AB2F900FFC021 /* VLCNetworkLoginViewController.m */; };
 		7D30F3DF183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3DE183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.m */; };
 		7D30F3E2183AB33200FFC021 /* VLCSidebarViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3E1183AB33200FFC021 /* VLCSidebarViewCell.m */; };
@@ -158,7 +158,7 @@
 		7D9870691A3E03D5009CF27D /* papasscode_marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D9870631A3E03D5009CF27D /* papasscode_marker@2x.png */; };
 		7D9CB9DC1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D9CB9DB1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m */; };
 		7DA8B0FB173318E80029698C /* SourceCodePro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7DA8B0F9173318E80029698C /* SourceCodePro-Regular.ttf */; };
-		7DAE0C2E1B2EDF7A00C53996 /* VLCLocalNetworkListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DAE0C2D1B2EDF7A00C53996 /* VLCLocalNetworkListViewController.m */; };
+		7DAE0C2E1B2EDF7A00C53996 /* VLCNetworkListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DAE0C2D1B2EDF7A00C53996 /* VLCNetworkListViewController.m */; };
 		7DAE0C311B2EDFD600C53996 /* VLCUPnPServerListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DAE0C301B2EDFD600C53996 /* VLCUPnPServerListViewController.m */; };
 		7DAE0C341B2EE0C200C53996 /* VLCFTPServerListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DAE0C331B2EE0C200C53996 /* VLCFTPServerListViewController.m */; };
 		7DAE0C371B2EF85B00C53996 /* VLCSidebarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DAE0C361B2EF85B00C53996 /* VLCSidebarController.m */; };
@@ -172,8 +172,8 @@
 		7DBBF19F183AB4300009A339 /* VLCEmptyLibraryView~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18A183AB4300009A339 /* VLCEmptyLibraryView~iphone.xib */; };
 		7DBBF1A0183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18B183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib */; };
 		7DBBF1A1183AB4300009A339 /* VLCPlaylistTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18C183AB4300009A339 /* VLCPlaylistTableViewCell.xib */; };
-		7DBBF1A3183AB4300009A339 /* VLCLocalNetworkListCell~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18E183AB4300009A339 /* VLCLocalNetworkListCell~ipad.xib */; };
-		7DBBF1A4183AB4300009A339 /* VLCLocalNetworkListCell~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18F183AB4300009A339 /* VLCLocalNetworkListCell~iphone.xib */; };
+		7DBBF1A3183AB4300009A339 /* VLCNetworkListCell~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18E183AB4300009A339 /* VLCNetworkListCell~ipad.xib */; };
+		7DBBF1A4183AB4300009A339 /* VLCNetworkListCell~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF18F183AB4300009A339 /* VLCNetworkListCell~iphone.xib */; };
 		7DBBF1A5183AB4300009A339 /* VLCMovieViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF190183AB4300009A339 /* VLCMovieViewController~ipad.xib */; };
 		7DBBF1A6183AB4300009A339 /* VLCMovieViewController~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF191183AB4300009A339 /* VLCMovieViewController~iphone.xib */; };
 		7DBBF1AC183AB4300009A339 /* VLCWiFiUploadTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DBBF197183AB4300009A339 /* VLCWiFiUploadTableViewCell.xib */; };
@@ -456,10 +456,10 @@
 		7D30F3CC183AB29300FFC021 /* VLCMenuTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMenuTableViewController.m; path = Sources/VLCMenuTableViewController.m; sourceTree = SOURCE_ROOT; };
 		7D30F3CE183AB2AC00FFC021 /* VLCMediaFileDiscoverer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaFileDiscoverer.h; path = Sources/VLCMediaFileDiscoverer.h; sourceTree = SOURCE_ROOT; };
 		7D30F3CF183AB2AC00FFC021 /* VLCMediaFileDiscoverer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMediaFileDiscoverer.m; path = Sources/VLCMediaFileDiscoverer.m; sourceTree = SOURCE_ROOT; };
-		7D30F3D1183AB2F100FFC021 /* VLCLocalNetworkListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLocalNetworkListCell.h; path = Sources/VLCLocalNetworkListCell.h; sourceTree = SOURCE_ROOT; };
-		7D30F3D2183AB2F100FFC021 /* VLCLocalNetworkListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCLocalNetworkListCell.m; path = Sources/VLCLocalNetworkListCell.m; sourceTree = SOURCE_ROOT; };
-		7D30F3D5183AB2F100FFC021 /* VLCLocalServerListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLocalServerListViewController.h; path = Sources/VLCLocalServerListViewController.h; sourceTree = SOURCE_ROOT; };
-		7D30F3D6183AB2F100FFC021 /* VLCLocalServerListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCLocalServerListViewController.m; path = Sources/VLCLocalServerListViewController.m; sourceTree = SOURCE_ROOT; };
+		7D30F3D1183AB2F100FFC021 /* VLCNetworkListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCNetworkListCell.h; path = Sources/VLCNetworkListCell.h; sourceTree = SOURCE_ROOT; };
+		7D30F3D2183AB2F100FFC021 /* VLCNetworkListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCNetworkListCell.m; path = Sources/VLCNetworkListCell.m; sourceTree = SOURCE_ROOT; };
+		7D30F3D5183AB2F100FFC021 /* VLCServerListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCServerListViewController.h; path = Sources/VLCServerListViewController.h; sourceTree = SOURCE_ROOT; };
+		7D30F3D6183AB2F100FFC021 /* VLCServerListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCServerListViewController.m; path = Sources/VLCServerListViewController.m; sourceTree = SOURCE_ROOT; };
 		7D30F3DA183AB2F900FFC021 /* VLCNetworkLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCNetworkLoginViewController.h; path = Sources/VLCNetworkLoginViewController.h; sourceTree = SOURCE_ROOT; };
 		7D30F3DB183AB2F900FFC021 /* VLCNetworkLoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCNetworkLoginViewController.m; path = Sources/VLCNetworkLoginViewController.m; sourceTree = SOURCE_ROOT; };
 		7D30F3DD183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCWiFiUploadTableViewCell.h; path = Sources/VLCWiFiUploadTableViewCell.h; sourceTree = SOURCE_ROOT; };
@@ -589,8 +589,8 @@
 		7D9CB9DA1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaybackNavigationController.h; path = Sources/VLCPlaybackNavigationController.h; sourceTree = SOURCE_ROOT; };
 		7D9CB9DB1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaybackNavigationController.m; path = Sources/VLCPlaybackNavigationController.m; sourceTree = SOURCE_ROOT; };
 		7DA8B0F9173318E80029698C /* SourceCodePro-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-Regular.ttf"; sourceTree = "<group>"; };
-		7DAE0C2C1B2EDF7A00C53996 /* VLCLocalNetworkListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLocalNetworkListViewController.h; path = Sources/VLCLocalNetworkListViewController.h; sourceTree = SOURCE_ROOT; };
-		7DAE0C2D1B2EDF7A00C53996 /* VLCLocalNetworkListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCLocalNetworkListViewController.m; path = Sources/VLCLocalNetworkListViewController.m; sourceTree = SOURCE_ROOT; };
+		7DAE0C2C1B2EDF7A00C53996 /* VLCNetworkListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCNetworkListViewController.h; path = Sources/VLCNetworkListViewController.h; sourceTree = SOURCE_ROOT; };
+		7DAE0C2D1B2EDF7A00C53996 /* VLCNetworkListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCNetworkListViewController.m; path = Sources/VLCNetworkListViewController.m; sourceTree = SOURCE_ROOT; };
 		7DAE0C2F1B2EDFD600C53996 /* VLCUPnPServerListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCUPnPServerListViewController.h; path = Sources/VLCUPnPServerListViewController.h; sourceTree = SOURCE_ROOT; };
 		7DAE0C301B2EDFD600C53996 /* VLCUPnPServerListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCUPnPServerListViewController.m; path = Sources/VLCUPnPServerListViewController.m; sourceTree = SOURCE_ROOT; };
 		7DAE0C321B2EE0C200C53996 /* VLCFTPServerListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCFTPServerListViewController.h; path = Sources/VLCFTPServerListViewController.h; sourceTree = SOURCE_ROOT; };
@@ -610,8 +610,8 @@
 		7DBBF18A183AB4300009A339 /* VLCEmptyLibraryView~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCEmptyLibraryView~iphone.xib"; path = "Resources/VLCEmptyLibraryView~iphone.xib"; sourceTree = SOURCE_ROOT; };
 		7DBBF18B183AB4300009A339 /* VLCPlaylistCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCPlaylistCollectionViewCell.xib; path = Resources/VLCPlaylistCollectionViewCell.xib; sourceTree = SOURCE_ROOT; };
 		7DBBF18C183AB4300009A339 /* VLCPlaylistTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCPlaylistTableViewCell.xib; path = Resources/VLCPlaylistTableViewCell.xib; sourceTree = SOURCE_ROOT; };
-		7DBBF18E183AB4300009A339 /* VLCLocalNetworkListCell~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCLocalNetworkListCell~ipad.xib"; path = "Resources/VLCLocalNetworkListCell~ipad.xib"; sourceTree = SOURCE_ROOT; };
-		7DBBF18F183AB4300009A339 /* VLCLocalNetworkListCell~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCLocalNetworkListCell~iphone.xib"; path = "Resources/VLCLocalNetworkListCell~iphone.xib"; sourceTree = SOURCE_ROOT; };
+		7DBBF18E183AB4300009A339 /* VLCNetworkListCell~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCNetworkListCell~ipad.xib"; path = "Resources/VLCNetworkListCell~ipad.xib"; sourceTree = SOURCE_ROOT; };
+		7DBBF18F183AB4300009A339 /* VLCNetworkListCell~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCNetworkListCell~iphone.xib"; path = "Resources/VLCNetworkListCell~iphone.xib"; sourceTree = SOURCE_ROOT; };
 		7DBBF190183AB4300009A339 /* VLCMovieViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCMovieViewController~ipad.xib"; path = "Resources/VLCMovieViewController~ipad.xib"; sourceTree = SOURCE_ROOT; };
 		7DBBF191183AB4300009A339 /* VLCMovieViewController~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCMovieViewController~iphone.xib"; path = "Resources/VLCMovieViewController~iphone.xib"; sourceTree = SOURCE_ROOT; };
 		7DBBF197183AB4300009A339 /* VLCWiFiUploadTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCWiFiUploadTableViewCell.xib; path = Resources/VLCWiFiUploadTableViewCell.xib; sourceTree = SOURCE_ROOT; };
@@ -1035,16 +1035,16 @@
 			children = (
 				7DCA8DA01B25BBAD00946349 /* PLEX */,
 				7DCA8DA11B25BBB700946349 /* Library Sharing */,
-				7D30F3D1183AB2F100FFC021 /* VLCLocalNetworkListCell.h */,
-				7D30F3D2183AB2F100FFC021 /* VLCLocalNetworkListCell.m */,
-				7DAE0C2C1B2EDF7A00C53996 /* VLCLocalNetworkListViewController.h */,
-				7DAE0C2D1B2EDF7A00C53996 /* VLCLocalNetworkListViewController.m */,
+				7D30F3D1183AB2F100FFC021 /* VLCNetworkListCell.h */,
+				7D30F3D2183AB2F100FFC021 /* VLCNetworkListCell.m */,
+				7DAE0C2C1B2EDF7A00C53996 /* VLCNetworkListViewController.h */,
+				7DAE0C2D1B2EDF7A00C53996 /* VLCNetworkListViewController.m */,
 				7DAE0C2F1B2EDFD600C53996 /* VLCUPnPServerListViewController.h */,
 				7DAE0C301B2EDFD600C53996 /* VLCUPnPServerListViewController.m */,
 				7DAE0C321B2EE0C200C53996 /* VLCFTPServerListViewController.h */,
 				7DAE0C331B2EE0C200C53996 /* VLCFTPServerListViewController.m */,
-				7D30F3D5183AB2F100FFC021 /* VLCLocalServerListViewController.h */,
-				7D30F3D6183AB2F100FFC021 /* VLCLocalServerListViewController.m */,
+				7D30F3D5183AB2F100FFC021 /* VLCServerListViewController.h */,
+				7D30F3D6183AB2F100FFC021 /* VLCServerListViewController.m */,
 				7D30F3DA183AB2F900FFC021 /* VLCNetworkLoginViewController.h */,
 				7D30F3DB183AB2F900FFC021 /* VLCNetworkLoginViewController.m */,
 			);
@@ -1207,8 +1207,8 @@
 			isa = PBXGroup;
 			children = (
 				7D89786E185DED88009BAB5D /* VLCDownloadViewController.xib */,
-				7DBBF18E183AB4300009A339 /* VLCLocalNetworkListCell~ipad.xib */,
-				7DBBF18F183AB4300009A339 /* VLCLocalNetworkListCell~iphone.xib */,
+				7DBBF18E183AB4300009A339 /* VLCNetworkListCell~ipad.xib */,
+				7DBBF18F183AB4300009A339 /* VLCNetworkListCell~iphone.xib */,
 				9B9231C3185A703700F89498 /* VLCNetworkLoginViewController.xib */,
 				7D89787C185DF794009BAB5D /* VLCOpenNetworkStreamViewController.xib */,
 				26E3A7001AAB76D300B32450 /* VLCPlexConnectServerViewController.xib */,
@@ -1764,7 +1764,7 @@
 				7DB638AB185BC0890003887C /* Images.xcassets in Resources */,
 				7D27EB9419DEE11900EF0370 /* Launch Screen.xib in Resources */,
 				7D6B08FC174D773C00A05173 /* Settings.bundle in Resources */,
-				7DBBF1A4183AB4300009A339 /* VLCLocalNetworkListCell~iphone.xib in Resources */,
+				7DBBF1A4183AB4300009A339 /* VLCNetworkListCell~iphone.xib in Resources */,
 				7DF04F501961F2B8004A5429 /* web-open.png in Resources */,
 				7D9870661A3E03D5009CF27D /* papasscode_failed_bg.png in Resources */,
 				7D9870681A3E03D5009CF27D /* papasscode_marker.png in Resources */,
@@ -1787,7 +1787,7 @@
 				7DBBF1AC183AB4300009A339 /* VLCWiFiUploadTableViewCell.xib in Resources */,
 				7D63C19718774F1000BD5256 /* VLCFirstStepsFourthPageViewController~ipad.xib in Resources */,
 				7DBC85631A50B8860098D388 /* LiveAuthDialog_iPad.xib in Resources */,
-				7DBBF1A3183AB4300009A339 /* VLCLocalNetworkListCell~ipad.xib in Resources */,
+				7DBBF1A3183AB4300009A339 /* VLCNetworkListCell~ipad.xib in Resources */,
 				7DBBF1A5183AB4300009A339 /* VLCMovieViewController~ipad.xib in Resources */,
 				26F1BFD01A770408001DF30C /* libMediaVLC.xml in Resources */,
 				7DBBF1A6183AB4300009A339 /* VLCMovieViewController~iphone.xib in Resources */,
@@ -1975,13 +1975,13 @@
 				265D511D1922746C00E38383 /* VLCPlexParser.m in Sources */,
 				2640FAE61B01477A00E359D6 /* VLCPlexWebAPI.m in Sources */,
 				7DB847D71A5871570002DC30 /* VLCOneDriveObject.m in Sources */,
-				7DAE0C2E1B2EDF7A00C53996 /* VLCLocalNetworkListViewController.m in Sources */,
+				7DAE0C2E1B2EDF7A00C53996 /* VLCNetworkListViewController.m in Sources */,
 				7D1052E91A4DCC1100295F08 /* VLCOneDriveTableViewController.m in Sources */,
-				7D30F3D7183AB2F100FFC021 /* VLCLocalNetworkListCell.m in Sources */,
+				7D30F3D7183AB2F100FFC021 /* VLCNetworkListCell.m in Sources */,
 				265D511C1922746C00E38383 /* VLCLocalPlexFolderListViewController.m in Sources */,
 				7D1052EE1A4DCD1E00295F08 /* VLCOneDriveController.m in Sources */,
 				7DAE0C371B2EF85B00C53996 /* VLCSidebarController.m in Sources */,
-				7D30F3D9183AB2F100FFC021 /* VLCLocalServerListViewController.m in Sources */,
+				7D30F3D9183AB2F100FFC021 /* VLCServerListViewController.m in Sources */,
 				7D30F3DC183AB2F900FFC021 /* VLCNetworkLoginViewController.m in Sources */,
 				DDB959421AFBB30500BB8CFF /* MappingModel_2_5_to_2_6.xcmappingmodel in Sources */,
 				7D30F3DF183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.m in Sources */,