created 0.2.2 build 2

Limelight/Images.xcassets/AddComputer.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "limelight_computer_add_1x.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "limelight_computer_add_2x.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "limelight_computer_add_3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Limelight/Images.xcassets/AddComputerIcon.imageset/Contents.json

@@ -2,7 +2,8 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "limelight_computer_add_icon_1x.png"
     },
     {
       "idiom" : "universal",
@@ -11,7 +12,8 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x"
+      "scale" : "3x",
+      "filename" : "limelight_computer_add_icon_3x.png"
     }
   ],
   "info" : {

Limelight/Images.xcassets/NoAppImage.imageset/Contents.json

@@ -2,7 +2,8 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "limelight_no_app_image_1x.png"
     },
     {
       "idiom" : "universal",
@@ -11,7 +12,8 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x"
+      "scale" : "3x",
+      "filename" : "limelight_no_app_image_3x.png"
     }
   ],
   "info" : {

Limelight/Images.xcassets/Settings.imageset/Contents.json

@@ -2,7 +2,8 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "settings_1x.png"
     },
     {
       "idiom" : "universal",
@@ -11,7 +12,8 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x"
+      "scale" : "3x",
+      "filename" : "settings_3x.png"
     }
   ],
   "info" : {

Limelight/Input/StreamView.m

@@ -19,36 +19,64 @@
     touchLocation = [touch locationInView:self];
     touchMoved = false;
     
-    printf("Touch down\n");
+    NSLog(@"Touch down");
 }
 
 - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
-    UITouch *touch = [[event allTouches] anyObject];
-    CGPoint currentLocation = [touch locationInView:self];
     
-    if (touchLocation.x != currentLocation.x ||
+    if ([[event allTouches] count] == 1) {
-        touchLocation.y != currentLocation.y)
+        UITouch *touch = [[event allTouches] anyObject];
-    {
+        CGPoint currentLocation = [touch locationInView:self];
-        LiSendMouseMoveEvent(currentLocation.x - touchLocation.x,
-                             currentLocation.y - touchLocation.y );
 
+        if (touchLocation.x != currentLocation.x ||
+            touchLocation.y != currentLocation.y)
+        {
+            LiSendMouseMoveEvent(currentLocation.x - touchLocation.x,
+                                 currentLocation.y - touchLocation.y );
+            
+            touchMoved = true;
+            touchLocation = currentLocation;
+        }
+    } else if ([[event allTouches] count] == 2) {
+        CGPoint firstLocation = [[[[event allTouches] allObjects] objectAtIndex:0] locationInView:self];
+        CGPoint secondLocation = [[[[event allTouches] allObjects] objectAtIndex:1] locationInView:self];
+        
+        CGPoint avgLocation = CGPointMake((firstLocation.x + secondLocation.x) / 2, (firstLocation.y + secondLocation.y) / 2);
+        if (touchLocation.y != avgLocation.y) {
+            LiSendScrollEvent(avgLocation.y - touchLocation.y);
+        }
         touchMoved = true;
-        touchLocation = currentLocation;
+        touchLocation = avgLocation;
     }
+    
 }
 
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
-    printf("Touch up\n");
+    NSLog(@"Touch up");
+    
     
     if (!touchMoved) {
-        printf("Sending left mouse button press\n");
+        if ([[event allTouches] count]  == 2) {
+            NSLog(@"Sending right mouse button press");
             
-        LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+            LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
             
-        // Wait 100 ms to simulate a real button press
+            // Wait 100 ms to simulate a real button press
-        usleep(100 * 1000);
+            usleep(100 * 1000);
             
-        LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+            LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
+            
+            
+        } else {
+            NSLog(@"Sending left mouse button press");
+            
+            LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+            
+            // Wait 100 ms to simulate a real button press
+            usleep(100 * 1000);
+            
+            LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+        }
     }
 }
 

Limelight/Limelight-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.0</string>
+	<string>0.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>2</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSRequiresIPhoneOS</key>

Limelight/Network/HttpManager.m

@@ -150,9 +150,10 @@ static const NSString* PORT = @"47984";
 }
 
 + (NSData*) fixXmlVersion:(NSData*) xmlData {
-    NSString* xmlString = [[[NSString alloc] initWithData:xmlData encoding:NSUTF8StringEncoding] stringByReplacingOccurrencesOfString:@"UTF-16" withString:@"UTF-8" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [xmlData length])];
+    NSString* dataString = [[NSString alloc] initWithData:xmlData encoding:NSUTF8StringEncoding];
-    //NSLog(@"xmlString: %@", xmlString);
+    NSString* xmlString = [dataString stringByReplacingOccurrencesOfString:@"UTF-16" withString:@"UTF-8" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [dataString length])];
-    return [NSData dataWithBytes:[xmlString UTF8String] length:[xmlString length]];
+    
+    return [xmlString dataUsingEncoding:NSUTF8StringEncoding];
 }
 
 - (id) initWithHost:(NSString*) host uniqueId:(NSString*) uniqueId deviceName:(NSString*) deviceName cert:(NSData*) cert {
@@ -272,7 +273,7 @@ static const NSString* PORT = @"47984";
 }
 
 - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
-    NSLog(@"Received data: %@", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
+    NSLog(@"\n\nReceived data: %@\n\n", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
     [_respData appendData:data];
 }
 

Limelight/Utility/Computer.m

@@ -28,4 +28,20 @@
     return self;
 }
 
+- (BOOL)isEqual:(id)object {
+    if ([object isKindOfClass:[Computer class]]) {
+        return [self.hostName isEqual:[object valueForKey:@"hostName"]];
+    } else {
+        return NO;
+    }
+}
+
+- (NSUInteger)hash {
+    NSUInteger prime = 31;
+    NSUInteger result = 1;
+    result = prime * result + (self.hostName == nil ? 0 : [self.hostName hash]);
+    
+    return result;
+}
+
 @end

Limelight/ViewControllers/MainFrameViewController.m

@@ -30,6 +30,8 @@
     UIAlertView* _pairAlert;
     UIScrollView* hostScrollView;
     UIScrollView* appScrollView;
+    
+    int currentPosition;
 }
 static NSString* deviceName = @"roth";
 static NSMutableSet* hostList;
@@ -147,6 +149,10 @@ static StreamConfiguration* streamConfig;
     streamConfig.height = [streamSettings.height intValue];
     streamConfig.width = [streamSettings.width intValue];
     
+    
+    if (currentPosition != FrontViewPositionLeft) {
+        [[self revealViewController] revealToggle:self];
+    }
     [self performSegueWithIdentifier:@"createStreamFrame" sender:nil];
 }
 
@@ -155,6 +161,7 @@ static StreamConfiguration* streamConfig;
     if (position == FrontViewPositionLeft) {
         [(SettingsViewController*)[revealController rearViewController] saveSettings];
     }
+    currentPosition = position;
 }
 
 - (void)viewDidLoad
@@ -164,17 +171,20 @@ static StreamConfiguration* streamConfig;
     // Change button color
     _settingsSidebarButton.tintColor = [UIColor colorWithRed:.2 green:.9 blue:0.f alpha:1.f];
     
-    // Set the side bar button action. When it's tapped, it'll show up the sidebar.
+    // Set the side bar button action. When it's tapped, it'll show the sidebar.
     _settingsSidebarButton.target = self.revealViewController;
     _settingsSidebarButton.action = @selector(revealToggle:);
     
     // Set the gesture
     [self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer];
     
+    // Get callbacks associated with the viewController
     [self.revealViewController setDelegate:self];
     
-    //NSArray* streamConfigVals = [[NSArray alloc] initWithObjects:@"1280x720 (30Hz)", @"1280x720 (60Hz)", @"1920x1080 (30Hz)", @"1920x1080 (60Hz)",nil];
+    // Set the current position to the center
+    currentPosition = FrontViewPositionLeft;
     
+    // Set up crypto
     _opQueue = [[NSOperationQueue alloc] init];
     [CryptoManager generateKeyPairUsingSSl];
     _uniqueId = [CryptoManager getUniqueID];

Limelight/ViewControllers/StreamFrameViewController.m

@@ -29,8 +29,8 @@
     
     [self.stageLabel setText:@"Starting App"];
     [self.stageLabel sizeToFit];
-    self.stageLabel.center = CGPointMake(self.view.frame.size.width / 2, self.stageLabel.center.y);
+    self.stageLabel.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height / 2);
-    
+    self.spinner.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height / 2 - self.stageLabel.frame.size.height - self.spinner.frame.size.height);
     [UIApplication sharedApplication].idleTimerDisabled = YES;
     
     _controllerSupport = [[ControllerSupport alloc] init];
@@ -62,7 +62,6 @@
         [self.spinner stopAnimating];
         [self.stageLabel setText:@"Waiting for first frame..."];
         [self.stageLabel sizeToFit];
-        self.stageLabel.center = CGPointMake(self.view.frame.size.width / 2, self.stageLabel.center.y);
     });
 }
 

iPad.storyboard

@@ -130,7 +130,7 @@
         <scene sceneID="RuD-qk-7nb">
             <objects>
                 <viewController storyboardIdentifier="MainFrame" id="OIm-0n-i9v" customClass="StreamFrameViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="VPm-Ae-rc4" userLabel="RenderView" customClass="StreamView">
+                    <view key="view" multipleTouchEnabled="YES" contentMode="scaleToFill" id="VPm-Ae-rc4" userLabel="RenderView" customClass="StreamView">
                         <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
@@ -165,7 +165,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Settings" width="17" height="17"/>
+        <image name="Settings" width="25" height="25"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar" statusBarStyle="lightContent"/>

iPhone.storyboard

@@ -132,21 +132,21 @@
         <scene sceneID="5Eb-q2-vjt">
             <objects>
                 <viewController id="mI3-9F-XwU" customClass="StreamFrameViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="eir-e9-IPE" customClass="StreamView">
+                    <view key="view" multipleTouchEnabled="YES" contentMode="scaleToFill" id="eir-e9-IPE" customClass="StreamView">
                         <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="white" id="0vm-Iv-K4b">
-                                <rect key="frame" x="274" y="150" width="20" height="20"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            </activityIndicatorView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Stage" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2HK-Z5-4Ch">
-                                <rect key="frame" x="262" y="178" width="45" height="21"/>
+                                <rect key="frame" x="262" y="149" width="45" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="white" id="0vm-Iv-K4b">
+                                <rect key="frame" x="274" y="121" width="20" height="20"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                            </activityIndicatorView>
                         </subviews>
                         <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
@@ -166,7 +166,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Settings" width="17" height="17"/>
+        <image name="Settings" width="25" height="25"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>