Update for backwards compatibility with GFE 2.1.x (WIP)

This commit is contained in:
Cameron Gutman 2015-02-01 20:21:54 -05:00
parent f300119d23
commit 7d584fb4de
3 changed files with 6 additions and 4 deletions

View File

@ -25,7 +25,7 @@
@interface Connection : NSOperation <NSStreamDelegate>
-(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks;
-(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks serverMajorVersion:(int)serverMajorVersion;
-(void) terminate;
-(void) terminateInternal;
-(void) main;

View File

@ -20,6 +20,7 @@
CONNECTION_LISTENER_CALLBACKS _clCallbacks;
DECODER_RENDERER_CALLBACKS _drCallbacks;
AUDIO_RENDERER_CALLBACKS _arCallbacks;
int _serverMajorVersion;
}
static OpusDecoder *opusDecoder;
@ -294,12 +295,13 @@ void ClDisplayTransientMessage(char* message)
LiStopConnection();
}
-(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks
-(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks serverMajorVersion:(int)serverMajorVersion
{
self = [super init];
_host = config.hostAddr;
renderer = myRenderer;
_callbacks = callbacks;
_serverMajorVersion = serverMajorVersion;
_streamConfig.width = config.width;
_streamConfig.height = config.height;
_streamConfig.fps = config.frameRate;
@ -431,7 +433,7 @@ static OSStatus playbackCallback(void *inRefCon,
&_drCallbacks,
&_arCallbacks,
&dummyPlCallbacks,
NULL, 0);
NULL, 0, _serverMajorVersion);
}

@ -1 +1 @@
Subproject commit 7883ce67cdf84c267f2cb51e5536ef45dc51549b
Subproject commit 0fa1a02e0a7ac560eff6411b238394459549fd6c