Update common-c and remove unused callbacks

This commit is contained in:
Cameron Gutman 2015-05-13 23:13:20 -05:00
parent cd18ca64bb
commit 6b97af13bf
2 changed files with 6 additions and 30 deletions

View File

@ -45,10 +45,6 @@ static int audioBufferQueueLength;
static AudioComponentInstance audioUnit; static AudioComponentInstance audioUnit;
static VideoDecoderRenderer* renderer; static VideoDecoderRenderer* renderer;
void DrSetup(int width, int height, int fps, void* context, int drFlags)
{
}
int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit)
{ {
int offset = 0; int offset = 0;
@ -69,18 +65,6 @@ int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit)
return [renderer submitDecodeBuffer:data length:decodeUnit->fullLength]; return [renderer submitDecodeBuffer:data length:decodeUnit->fullLength];
} }
void DrStart(void)
{
}
void DrStop(void)
{
}
void DrRelease(void)
{
}
void ArInit(void) void ArInit(void)
{ {
int err; int err;
@ -315,10 +299,10 @@ void ClDisplayTransientMessage(char* message)
int riKeyId = htonl(config.riKeyId); int riKeyId = htonl(config.riKeyId);
memcpy(_streamConfig.remoteInputAesIv, &riKeyId, sizeof(riKeyId)); memcpy(_streamConfig.remoteInputAesIv, &riKeyId, sizeof(riKeyId));
_drCallbacks.setup = DrSetup; _drCallbacks.setup = NULL;
_drCallbacks.start = DrStart; _drCallbacks.start = NULL;
_drCallbacks.stop = DrStop; _drCallbacks.stop = NULL;
_drCallbacks.release = DrRelease; _drCallbacks.release = NULL;
_drCallbacks.submitDecodeUnit = DrSubmitDecodeUnit; _drCallbacks.submitDecodeUnit = DrSubmitDecodeUnit;
_arCallbacks.init = ArInit; _arCallbacks.init = ArInit;
@ -421,21 +405,13 @@ static OSStatus playbackCallback(void *inRefCon,
-(void) main -(void) main
{ {
PLATFORM_CALLBACKS dummyPlCallbacks;
// Only used on Windows
dummyPlCallbacks.threadStart = NULL;
dummyPlCallbacks.debugPrint = NULL;
LiStartConnection(_host, LiStartConnection(_host,
&_streamConfig, &_streamConfig,
&_clCallbacks, &_clCallbacks,
&_drCallbacks, &_drCallbacks,
&_arCallbacks, &_arCallbacks,
&dummyPlCallbacks, NULL,
NULL, 0, _serverMajorVersion); NULL, 0, _serverMajorVersion);
} }
@end @end

@ -1 +1 @@
Subproject commit b74b54be53087b713ed9c1581d15344de74cdec7 Subproject commit dcc1b932de79ca0d1e5db5803d4808423adbd649