Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 12e7218848 | |||
| 230ed02f31 | |||
| b189ca63a0 | |||
| 859976339f | |||
| 8823bbdc15 | |||
| a6e4ec93bd | |||
| 8e47ee2924 | |||
| 46a3e67ad0 | |||
| 06fe1615ed | |||
| a32ba73a88 | |||
| 6d00aa0dff |
@@ -1,6 +1,6 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "StreamingKit"
|
||||
s.version = "0.1.29"
|
||||
s.version = "0.1.30"
|
||||
s.summary = "A fast and extensible audio streamer for iOS and OSX with support for gapless playback and custom (non-HTTP) sources."
|
||||
s.homepage = "https://github.com/tumtumtum/StreamingKit/"
|
||||
s.license = 'MIT'
|
||||
|
||||
@@ -167,7 +167,7 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn
|
||||
/// Gets the reason why the player is stopped (if any)
|
||||
@property (readonly) STKAudioPlayerStopReason stopReason;
|
||||
/// Gets and sets the delegate used for receiving events from the STKAudioPlayer
|
||||
@property (readwrite, unsafe_unretained) id<STKAudioPlayerDelegate> delegate;
|
||||
@property (readwrite, weak) id<STKAudioPlayerDelegate> delegate;
|
||||
|
||||
/// Creates a datasource from a given URL.
|
||||
/// URLs with FILE schemes will return an STKLocalFileDataSource.
|
||||
|
||||
@@ -1497,15 +1497,15 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
|
||||
|
||||
error = AudioFileStreamSeek(audioFileStream, seekPacket, &packetAlignedByteOffset, &ioFlags);
|
||||
|
||||
if (!error && !(ioFlags & kAudioFileStreamSeekFlag_OffsetIsEstimated))
|
||||
{
|
||||
double delta = ((seekByteOffset - (SInt64)currentEntry->audioDataOffset) - packetAlignedByteOffset) / calculatedBitRate * 8;
|
||||
|
||||
OSSpinLockLock(¤tEntry->spinLock);
|
||||
currentEntry->seekTime -= delta;
|
||||
OSSpinLockUnlock(¤tEntry->spinLock);
|
||||
|
||||
if (!error) {
|
||||
seekByteOffset = packetAlignedByteOffset + currentEntry->audioDataOffset;
|
||||
if (!(ioFlags & kAudioFileStreamSeekFlag_OffsetIsEstimated)) {
|
||||
double delta = ((seekByteOffset - (SInt64)currentEntry->audioDataOffset) - packetAlignedByteOffset) / calculatedBitRate * 8;
|
||||
|
||||
OSSpinLockLock(¤tEntry->spinLock);
|
||||
currentEntry->seekTime -= delta;
|
||||
OSSpinLockUnlock(¤tEntry->spinLock);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -554,11 +554,9 @@
|
||||
if ([self->currentUrl.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)
|
||||
{
|
||||
NSDictionary* sslSettings = [NSDictionary dictionaryWithObjectsAndKeys:
|
||||
(NSString*)kCFStreamSocketSecurityLevelNegotiatedSSL, kCFStreamSSLLevel,
|
||||
[NSNumber numberWithBool:NO], kCFStreamSSLValidatesCertificateChain,
|
||||
[NSNull null], kCFStreamSSLPeerName,
|
||||
nil];
|
||||
|
||||
(NSString*)kCFStreamSocketSecurityLevelNegotiatedSSL, kCFStreamSSLLevel,
|
||||
[NSNumber numberWithBool:NO], kCFStreamSSLValidatesCertificateChain,
|
||||
nil];
|
||||
CFReadStreamSetProperty(stream, kCFStreamPropertySSLSettings, (__bridge CFTypeRef)sslSettings);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user