menu: get rid of the http server info button and show the address to upload stuff directly in a label

AspenProject/VLCAddMediaViewController.h

@@ -19,8 +19,8 @@
 @property (strong, nonatomic) IBOutlet UIButton *openNetworkStreamButton;
 @property (strong, nonatomic) IBOutlet UIButton *downloadFromHTTPServerButton;
 @property (strong, nonatomic) IBOutlet UIButton *settingsButton;
-@property (strong, nonatomic) IBOutlet UIButton *showInformationOnHTTPUploadButton;
 @property (strong, nonatomic) IBOutlet UISwitch *httpUploadServerSwitch;
+@property (strong, nonatomic) IBOutlet UILabel *httpUploadServerLocationLabel;
 
 @property (strong, nonatomic) IBOutlet UIView *openURLView;
 @property (strong, nonatomic) IBOutlet UITextField *openURLField;
@@ -30,7 +30,6 @@
 - (IBAction)openNetworkStream:(id)sender;
 - (IBAction)downloadFromHTTPServer:(id)sender;
 - (IBAction)showSettings:(id)sender;
-- (IBAction)showInformationOnHTTPServer:(id)sender;
 - (IBAction)toggleHTTPServer:(id)sender;
 
 @end

AspenProject/VLCAddMediaViewController.m

@@ -13,6 +13,10 @@
 #import "VLCMovieViewController.h"
 #import "VLCHTTPUploaderController.h"
 #import "VLCSettingsViewController.h"
+#import "HTTPServer.h"
+
+#import <ifaddrs.h>
+#import <arpa/inet.h>
 
 @interface VLCAddMediaViewController () {
     VLCHTTPUploaderController *_uploadController;
@@ -114,14 +118,37 @@
     [appDelegate.playlistViewController.navigationController presentModalViewController:self.settingsViewController animated:YES];
 }
 
-- (IBAction)showInformationOnHTTPServer:(id)sender
+- (NSString *)_currentIPAddress
 {
+    NSString *address = @"";
+    struct ifaddrs *interfaces = NULL;
+    struct ifaddrs *temp_addr = NULL;
+    int success = getifaddrs(&interfaces);
+    if (success == 0) {
+        temp_addr = interfaces;
+        while(temp_addr != NULL) {
+            if(temp_addr->ifa_addr->sa_family == AF_INET) {
+                if([[NSString stringWithUTF8String:temp_addr->ifa_name] isEqualToString:@"en0"])
+                    address = [NSString stringWithUTF8String:inet_ntoa(((struct sockaddr_in *)temp_addr->ifa_addr)->sin_addr)];
+            }
+            temp_addr = temp_addr->ifa_next;
+        }
+    }
+    // Free memory
+    freeifaddrs(interfaces);
+    return address;
 }
 
 - (IBAction)toggleHTTPServer:(UISwitch *)sender
 {
     _uploadController = [[VLCHTTPUploaderController alloc] init];
     [_uploadController changeHTTPServerState: sender.on];
+
+    HTTPServer *server = _uploadController.httpServer;
+    if (server.isRunning)
+        self.httpUploadServerLocationLabel.text = [NSString stringWithFormat:@"http://%@:%i", [self _currentIPAddress], server.listeningPort];
+    else
+        self.httpUploadServerLocationLabel.text = NSLocalizedString(@"HTTP_UPLOAD_SERVER_OFF", @"");
 }
 
 @end

Resources/VLCAddMediaViewController~ipad.xib

@@ -104,7 +104,7 @@
 					<object class="IBUIButton" id="665933893">
 						<reference key="NSNextResponder" ref="892317093"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{0, 204}, {320, 60}}</string>
+						<string key="NSFrame">{{0, 220}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1021636329"/>
@@ -127,9 +127,10 @@
 					<object class="IBUIButton" id="1021636329">
 						<reference key="NSNextResponder" ref="892317093"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{0, 272}, {320, 60}}</string>
+						<string key="NSFrame">{{0, 288}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -156,7 +157,7 @@
 								<string key="NSFrame">{{208, 16}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="775197480"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="665933893"/>
+								<reference key="NSNextKeyView" ref="446179656"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -166,7 +167,7 @@
 							<object class="IBUILabel" id="1058448762">
 								<reference key="NSNextResponder" ref="775197480"/>
 								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{46, 19}, {169, 21}}</string>
+								<string key="NSFrame">{{20, 19}, {195, 21}}</string>
 								<reference key="NSSuperview" ref="775197480"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="333552093"/>
@@ -188,30 +189,40 @@
 								<reference key="IBUIFont" ref="327024238"/>
 								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
-							<object class="IBUIButton" id="972567322">
+							<object class="IBUILabel" id="446179656">
 								<reference key="NSNextResponder" ref="775197480"/>
 								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{20, 20}, {18, 19}}</string>
+								<string key="NSFrame">{{20, 48}, {280, 21}}</string>
 								<reference key="NSSuperview" ref="775197480"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="665933893"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<int key="IBUIButtonType">4</int>
-								<bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
-								<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
-								<object class="NSColor" key="IBUINormalTitleColor">
+								<string key="IBUIText">Inactive Server</string>
+								<object class="NSColor" key="IBUITextColor">
 									<int key="NSColorSpace">1</int>
 									<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 								</object>
-								<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="327024238"/>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">0</int>
+								<int key="IBUITextAlignment">1</int>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="586768340">
+									<int key="type">1</int>
+									<double key="pointSize">14</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="772231698">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">14</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
 						</array>
-						<string key="NSFrame">{{0, 136}, {320, 60}}</string>
+						<string key="NSFrame">{{0, 136}, {320, 76}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1058448762"/>
@@ -220,7 +231,7 @@
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 				</array>
-				<string key="NSFrameSize">{320, 332}</string>
+				<string key="NSFrameSize">{320, 348}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="233942944"/>
@@ -266,15 +277,8 @@
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
-						<object class="IBUIFontDescription" key="IBUIFontDescription">
-							<int key="type">1</int>
-							<double key="pointSize">14</double>
-						</object>
-						<object class="NSFont" key="IBUIFont">
-							<string key="NSName">Helvetica</string>
-							<double key="NSSize">14</double>
-							<int key="NSfFlags">16</int>
-						</object>
+						<reference key="IBUIFontDescription" ref="586768340"/>
+						<reference key="IBUIFont" ref="772231698"/>
 					</object>
 					<object class="IBUIButton" id="712064142">
 						<reference key="NSNextResponder" ref="239666395"/>
@@ -282,6 +286,7 @@
 						<string key="NSFrame">{{229, 8}, {70, 44}}</string>
 						<reference key="NSSuperview" ref="239666395"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -346,14 +351,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">showInformationOnHTTPUploadButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="972567322"/>
-					</object>
-					<int key="connectionID">49</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">httpUploadServerSwitch</string>
 						<reference key="source" ref="372490531"/>
 						<reference key="destination" ref="333552093"/>
@@ -393,6 +390,14 @@
 					<int key="connectionID">59</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">httpUploadServerLocationLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="446179656"/>
+					</object>
+					<int key="connectionID">62</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">openNetworkStream:</string>
 						<reference key="source" ref="233942944"/>
@@ -439,15 +444,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">showInformationOnHTTPServer:</string>
-						<reference key="source" ref="972567322"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">48</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">openNetworkStream:</string>
 						<reference key="source" ref="712064142"/>
 						<reference key="destination" ref="372490531"/>
@@ -514,7 +510,7 @@
 						<array class="NSMutableArray" key="children">
 							<reference ref="333552093"/>
 							<reference ref="1058448762"/>
-							<reference ref="972567322"/>
+							<reference ref="446179656"/>
 						</array>
 						<reference key="parent" ref="892317093"/>
 					</object>
@@ -529,11 +525,6 @@
 						<reference key="parent" ref="775197480"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">47</int>
-						<reference key="object" ref="972567322"/>
-						<reference key="parent" ref="775197480"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">54</int>
 						<reference key="object" ref="239666395"/>
 						<array class="NSMutableArray" key="children">
@@ -552,6 +543,11 @@
 						<reference key="object" ref="988543427"/>
 						<reference key="parent" ref="239666395"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">61</int>
+						<reference key="object" ref="446179656"/>
+						<reference key="parent" ref="775197480"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -567,16 +563,16 @@
 				<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="45.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="46.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="54.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="55.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">60</int>
+			<int key="maxID">62</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -621,13 +617,13 @@
 						<string key="aboutButton">UIButton</string>
 						<string key="dismissButton">UIButton</string>
 						<string key="downloadFromHTTPServerButton">UIButton</string>
+						<string key="httpUploadServerLocationLabel">UILabel</string>
 						<string key="httpUploadServerSwitch">UISwitch</string>
 						<string key="openNetworkStreamButton">UIButton</string>
 						<string key="openURLButton">UIButton</string>
 						<string key="openURLField">UITextField</string>
 						<string key="openURLView">UIView</string>
 						<string key="settingsButton">UIButton</string>
-						<string key="showInformationOnHTTPUploadButton">UIButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="aboutButton">
@@ -642,6 +638,10 @@
 							<string key="name">downloadFromHTTPServerButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="httpUploadServerLocationLabel">
+							<string key="name">httpUploadServerLocationLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="httpUploadServerSwitch">
 							<string key="name">httpUploadServerSwitch</string>
 							<string key="candidateClassName">UISwitch</string>
@@ -666,10 +666,6 @@
 							<string key="name">settingsButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="showInformationOnHTTPUploadButton">
-							<string key="name">showInformationOnHTTPUploadButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>

Resources/VLCAddMediaViewController~iphone.xib

@@ -106,7 +106,7 @@
 					<object class="IBUIButton" id="1021636329">
 						<reference key="NSNextResponder" ref="892317093"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{0, 324}, {320, 60}}</string>
+						<string key="NSFrame">{{0, 340}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
 						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -155,7 +155,7 @@
 					<object class="IBUIButton" id="205209326">
 						<reference key="NSNextResponder" ref="892317093"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{0, 256}, {320, 60}}</string>
+						<string key="NSFrame">{{0, 272}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1021636329"/>
@@ -185,7 +185,7 @@
 								<string key="NSFrame">{{208, 16}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="485650876"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="205209326"/>
+								<reference key="NSNextKeyView" ref="892025683"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -195,7 +195,7 @@
 							<object class="IBUILabel" id="238446432">
 								<reference key="NSNextResponder" ref="485650876"/>
 								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{46, 19}, {169, 21}}</string>
+								<string key="NSFrame">{{20, 19}, {195, 21}}</string>
 								<reference key="NSSuperview" ref="485650876"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="434153343"/>
@@ -217,40 +217,49 @@
 								<reference key="IBUIFont" ref="327024238"/>
 								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
-							<object class="IBUIButton" id="650620887">
+							<object class="IBUILabel" id="892025683">
 								<reference key="NSNextResponder" ref="485650876"/>
 								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{20, 20}, {18, 19}}</string>
+								<string key="NSFrame">{{20, 48}, {280, 21}}</string>
 								<reference key="NSSuperview" ref="485650876"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="238446432"/>
+								<reference key="NSNextKeyView" ref="205209326"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<int key="IBUIButtonType">4</int>
-								<bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
-								<reference key="IBUIHighlightedTitleColor" ref="878206399"/>
-								<object class="NSColor" key="IBUINormalTitleColor">
+								<string key="IBUIText">Inactive Server</string>
+								<object class="NSColor" key="IBUITextColor">
 									<int key="NSColorSpace">1</int>
 									<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 								</object>
-								<reference key="IBUINormalTitleShadowColor" ref="1025413593"/>
-								<reference key="IBUIFontDescription" ref="886215057"/>
-								<reference key="IBUIFont" ref="327024238"/>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">0</int>
+								<int key="IBUITextAlignment">1</int>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="142511261">
+									<int key="type">1</int>
+									<double key="pointSize">14</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="46532205">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">14</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
 						</array>
-						<string key="NSFrame">{{0, 188}, {320, 60}}</string>
+						<string key="NSFrame">{{0, 188}, {320, 76}}</string>
 						<reference key="NSSuperview" ref="892317093"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="650620887"/>
+						<reference key="NSNextKeyView" ref="238446432"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="937037271"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 				</array>
-				<string key="NSFrameSize">{320, 384}</string>
+				<string key="NSFrameSize">{320, 400}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="765845946"/>
@@ -274,7 +283,6 @@
 						<int key="NSvFlags">294</int>
 						<string key="NSFrame">{{20, 15}, {201, 30}}</string>
 						<reference key="NSSuperview" ref="574364168"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="293148001"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -295,22 +303,14 @@
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
-						<object class="IBUIFontDescription" key="IBUIFontDescription">
-							<int key="type">1</int>
-							<double key="pointSize">14</double>
-						</object>
-						<object class="NSFont" key="IBUIFont">
-							<string key="NSName">Helvetica</string>
-							<double key="NSSize">14</double>
-							<int key="NSfFlags">16</int>
-						</object>
+						<reference key="IBUIFontDescription" ref="142511261"/>
+						<reference key="IBUIFont" ref="46532205"/>
 					</object>
 					<object class="IBUIButton" id="293148001">
 						<reference key="NSNextResponder" ref="574364168"/>
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{229, 8}, {70, 44}}</string>
 						<reference key="NSSuperview" ref="574364168"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -330,7 +330,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 60}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="309180653"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="937037271"/>
@@ -382,14 +381,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">showInformationOnHTTPUploadButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="650620887"/>
-					</object>
-					<int key="connectionID">58</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">httpUploadServerSwitch</string>
 						<reference key="source" ref="372490531"/>
 						<reference key="destination" ref="434153343"/>
@@ -421,6 +412,14 @@
 					<int key="connectionID">68</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">httpUploadServerLocationLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="892025683"/>
+					</object>
+					<int key="connectionID">70</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">openNetworkStream:</string>
 						<reference key="source" ref="233942944"/>
@@ -466,15 +465,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">showInformationOnHTTPServer:</string>
-						<reference key="source" ref="650620887"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">59</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">toggleHTTPServer:</string>
 						<reference key="source" ref="434153343"/>
 						<reference key="destination" ref="372490531"/>
@@ -518,9 +508,9 @@
 							<reference ref="233942944"/>
 							<reference ref="306241553"/>
 							<reference ref="765845946"/>
-							<reference ref="205209326"/>
 							<reference ref="485650876"/>
 							<reference ref="1021636329"/>
+							<reference ref="205209326"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -568,18 +558,13 @@
 						<int key="objectID">51</int>
 						<reference key="object" ref="485650876"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="650620887"/>
 							<reference ref="238446432"/>
 							<reference ref="434153343"/>
+							<reference ref="892025683"/>
 						</array>
 						<reference key="parent" ref="892317093"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">52</int>
-						<reference key="object" ref="650620887"/>
-						<reference key="parent" ref="485650876"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">53</int>
 						<reference key="object" ref="238446432"/>
 						<reference key="parent" ref="485650876"/>
@@ -608,6 +593,11 @@
 						<reference key="object" ref="293148001"/>
 						<reference key="parent" ref="574364168"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">69</int>
+						<reference key="object" ref="892025683"/>
+						<reference key="parent" ref="485650876"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -624,18 +614,18 @@
 				<string key="48.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="50.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="51.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="52.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="53.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="54.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="62.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="63.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="64.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">68</int>
+			<int key="maxID">70</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -680,13 +670,13 @@
 						<string key="aboutButton">UIButton</string>
 						<string key="dismissButton">UIButton</string>
 						<string key="downloadFromHTTPServerButton">UIButton</string>
+						<string key="httpUploadServerLocationLabel">UILabel</string>
 						<string key="httpUploadServerSwitch">UISwitch</string>
 						<string key="openNetworkStreamButton">UIButton</string>
 						<string key="openURLButton">UIButton</string>
 						<string key="openURLField">UITextField</string>
 						<string key="openURLView">UIView</string>
 						<string key="settingsButton">UIButton</string>
-						<string key="showInformationOnHTTPUploadButton">UIButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="aboutButton">
@@ -701,6 +691,10 @@
 							<string key="name">downloadFromHTTPServerButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="httpUploadServerLocationLabel">
+							<string key="name">httpUploadServerLocationLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="httpUploadServerSwitch">
 							<string key="name">httpUploadServerSwitch</string>
 							<string key="candidateClassName">UISwitch</string>
@@ -725,10 +719,6 @@
 							<string key="name">settingsButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="showInformationOnHTTPUploadButton">
-							<string key="name">showInformationOnHTTPUploadButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>

VLC for iOS.xcodeproj/project.pbxproj

@@ -19,7 +19,6 @@
 		2915540817490A1E00B86CAD /* MultipartFormDataParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 291553FC17490A1E00B86CAD /* MultipartFormDataParser.m */; };
 		2915540917490A1E00B86CAD /* MultipartMessageHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 291553FE17490A1E00B86CAD /* MultipartMessageHeader.m */; };
 		2915540A17490A1E00B86CAD /* MultipartMessageHeaderField.m in Sources */ = {isa = PBXBuildFile; fileRef = 2915540017490A1E00B86CAD /* MultipartMessageHeaderField.m */; };
-		2915542117490A9C00B86CAD /* About.txt in Resources */ = {isa = PBXBuildFile; fileRef = 2915540C17490A9C00B86CAD /* About.txt */; };
 		2915542217490A9C00B86CAD /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 2915540E17490A9C00B86CAD /* GCDAsyncSocket.m */; };
 		2915542317490A9C00B86CAD /* About.txt in Resources */ = {isa = PBXBuildFile; fileRef = 2915541017490A9C00B86CAD /* About.txt */; };
 		2915542417490A9C00B86CAD /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 2915541217490A9C00B86CAD /* DDAbstractDatabaseLogger.m */; };
@@ -163,7 +162,6 @@
 		291553FE17490A1E00B86CAD /* MultipartMessageHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MultipartMessageHeader.m; sourceTree = "<group>"; };
 		291553FF17490A1E00B86CAD /* MultipartMessageHeaderField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultipartMessageHeaderField.h; sourceTree = "<group>"; };
 		2915540017490A1E00B86CAD /* MultipartMessageHeaderField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MultipartMessageHeaderField.m; sourceTree = "<group>"; };
-		2915540C17490A9C00B86CAD /* About.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = About.txt; sourceTree = "<group>"; };
 		2915540D17490A9C00B86CAD /* GCDAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncSocket.h; sourceTree = "<group>"; };
 		2915540E17490A9C00B86CAD /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = "<group>"; };
 		2915541017490A9C00B86CAD /* About.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = About.txt; sourceTree = "<group>"; };
@@ -424,7 +422,6 @@
 		2915540B17490A9C00B86CAD /* CocoaAsyncSocket */ = {
 			isa = PBXGroup;
 			children = (
-				2915540C17490A9C00B86CAD /* About.txt */,
 				2915540D17490A9C00B86CAD /* GCDAsyncSocket.h */,
 				2915540E17490A9C00B86CAD /* GCDAsyncSocket.m */,
 			);
@@ -868,7 +865,6 @@
 				7D6BA10F1747F26300C0E203 /* VLCPasscodeLockViewController~iphone.xib in Resources */,
 				7D6BA1121748EA8300C0E203 /* playback_background.png in Resources */,
 				7D6BA1131748EA8300C0E203 /* playback_background@2x.png in Resources */,
-				2915542117490A9C00B86CAD /* About.txt in Resources */,
 				2915542317490A9C00B86CAD /* About.txt in Resources */,
 				2915542B17490A9C00B86CAD /* README.txt in Resources */,
 				7D6BA1181748EFE100C0E203 /* VLCAddMediaViewController~ipad.xib in Resources */,