Merge branch 'new-ui' of github.com:limelight-stream/limelight-ios into new-ui

# By Cameron Gutman
# Via Cameron Gutman
* 'new-ui' of github.com:limelight-stream/limelight-ios:
  Update common submodule
  Cherry Pick "Update to the new common library"
  Cherry Pick "Fix iOS build with new common"
This commit is contained in:
Diego Waxemberg 2014-11-26 13:15:00 -05:00
commit 99d3ac45c3
2 changed files with 14 additions and 2 deletions

View File

@ -408,7 +408,19 @@ static OSStatus playbackCallback(void *inRefCon,
-(void) main -(void) main
{ {
LiStartConnection(_host, &_streamConfig, &_clCallbacks, &_drCallbacks, &_arCallbacks, NULL, 0); PLATFORM_CALLBACKS dummyPlCallbacks;
// Only used on Windows
dummyPlCallbacks.threadStart = NULL;
dummyPlCallbacks.debugPrint = NULL;
LiStartConnection(_host,
&_streamConfig,
&_clCallbacks,
&_drCallbacks,
&_arCallbacks,
&dummyPlCallbacks,
NULL, 0);
} }

@ -1 +1 @@
Subproject commit 71ace097f8a5904785b978e9b0b73380bbe900c5 Subproject commit 9143994588db7704ca659cb0ffdc277bd11e41fe