Compare commits

...
9 Commits
7 changed files with 22 additions and 8 deletions

No files matched your search

Binary file not shown.
+1 -1
View File
@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.4.1</string> <string>0.9.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
+2 -1
View File
@@ -88,7 +88,7 @@
} }
- (BOOL) addHostToDiscovery:(Host *)host { - (BOOL) addHostToDiscovery:(Host *)host {
if (![self isHostInDiscovery:host]) { if (host.uuid.length > 0 && ![self isHostInDiscovery:host]) {
[_hostQueue addObject:host]; [_hostQueue addObject:host];
if (shouldDiscover) { if (shouldDiscover) {
[_opQueue addOperation:[self createWorkerForHost:host]]; [_opQueue addOperation:[self createWorkerForHost:host]];
@@ -125,6 +125,7 @@
[dataMan removeHost:host]; [dataMan removeHost:host];
} }
} }
[dataMan saveHosts];
}); });
} }
+5 -5
View File
@@ -18,11 +18,11 @@
} }
- (void) populateHost:(Host*)host { - (void) populateHost:(Host*)host {
host.name = [self getStringTag:TAG_HOSTNAME]; host.name = [[self getStringTag:TAG_HOSTNAME] trim];
host.externalAddress = [self getStringTag:TAG_EXTERNAL_IP]; host.externalAddress = [[self getStringTag:TAG_EXTERNAL_IP] trim];
host.localAddress = [self getStringTag:TAG_LOCAL_IP]; host.localAddress = [[self getStringTag:TAG_LOCAL_IP] trim];
host.uuid = [self getStringTag:TAG_UNIQUE_ID]; host.uuid = [[self getStringTag:TAG_UNIQUE_ID] trim];
host.mac = [self getStringTag:TAG_MAC_ADDRESS]; host.mac = [[self getStringTag:TAG_MAC_ADDRESS] trim];
NSInteger pairStatus; NSInteger pairStatus;
if ([self getIntTag:TAG_PAIR_STATUS value:&pairStatus]) { if ([self getIntTag:TAG_PAIR_STATUS value:&pairStatus]) {
+6
View File
@@ -24,3 +24,9 @@ FOUNDATION_EXPORT NSString *const deviceName;
+ (int) resolveHost:(NSString*)host; + (int) resolveHost:(NSString*)host;
@end @end
@interface NSString (NSStringWithTrim)
- (NSString*) trim;
@end
+7
View File
@@ -73,5 +73,12 @@ NSString *const deviceName = @"roth";
} }
} }
@end
@implementation NSString (NSStringWithTrim)
- (NSString *)trim {
return [self stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
}
@end @end
@@ -40,7 +40,7 @@ static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
[self.resolutionSelector setSelectedSegmentIndex:resolution]; [self.resolutionSelector setSelectedSegmentIndex:resolution];
[self.framerateSelector setSelectedSegmentIndex:framerate]; [self.framerateSelector setSelectedSegmentIndex:framerate];
[self.onscreenControlSelector setSelectedSegmentIndex:onscreenControls]; [self.onscreenControlSelector setSelectedSegmentIndex:onscreenControls];
[self.bitrateSlider setValue:(_bitrate / 1000) animated:YES]; [self.bitrateSlider setValue:(_bitrate / BITRATE_INTERVAL) animated:YES];
[self.bitrateSlider addTarget:self action:@selector(bitrateSliderMoved) forControlEvents:UIControlEventValueChanged]; [self.bitrateSlider addTarget:self action:@selector(bitrateSliderMoved) forControlEvents:UIControlEventValueChanged];
[self updateBitrateText]; [self updateBitrateText];
} }