Merge branch 'master' of github.com:limelight-stream/limelight-ios

Conflicts:
	Limelight/StreamFrameViewController.m
This commit is contained in:
Cameron Gutman
2014-10-20 21:15:07 -04:00
12 changed files with 108 additions and 44 deletions

View File

@@ -29,7 +29,7 @@
_controllerSupport = [[ControllerSupport alloc] init];
StreamManager* streamMan = [[StreamManager alloc] initWithHost:[MainFrameViewController getHost] renderView:self.view];
StreamManager* streamMan = [[StreamManager alloc] initWithConfig:[MainFrameViewController getStreamConfiguration] renderView:self.view];
NSOperationQueue* opQueue = [[NSOperationQueue alloc] init];
[opQueue addOperation:streamMan];
}