TouchInstinct
/
StreamingKit
310
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed conflicts

This commit is contained in:
Thong Nguyen 2015-12-19 23:11:25 +00:00
parent 6264442f58 f84f1ef0bd
commit d9a6ba7248
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
StreamingKit/StreamingKit/STKAudioPlayer.m
View File

@ -907,7 +907,7 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
}
case kAudioFileStreamProperty_ReadyToProducePackets:
{
if (audioConverterAudioStreamBasicDescription.mFormatID != kAudioFormatLinearPCM)
if (!(audioConverterAudioStreamBasicDescription.mFormatID == kAudioFormatLinearPCM))
{
discontinuous = YES;
}
@ -1977,7 +1977,7 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
[self destroyAudioConverter];
canonicalAudioStreamBasicDescription.mChannelsPerFrame = asbd->mChannelsPerFrame;
//canonicalAudioStreamBasicDescription.mChannelsPerFrame = asbd->mChannelsPerFrame;
BOOL isRecording = currentlyReadingEntry.dataSource.recordToFileUrl != nil;
if (isRecording)

2
StreamingKit/StreamingKit/STKHTTPDataSource.m
View File

@ -411,7 +411,7 @@
eventsRunLoop = savedEventsRunLoop;
[self seekToOffset:self.position];
[self seekToOffset:self->supportsSeek ? self.position : 0];
}
-(void) seekToOffset:(SInt64)offset