Compare commits

..

11 Commits

Author SHA1 Message Date
derpoliuk 12e7218848 Update project's version in StreamingKit.podspec 2018-01-17 15:37:48 +02:00
Stanislav Derpoliuk 230ed02f31 Merge pull request #384 from derpoliuk/fix-seek-progress
Fix wrong -[STKAudioPlayer progress] after seek
2018-01-17 15:32:45 +02:00
derpoliuk b189ca63a0 Fix wrong -[STKAudioPlayer progress] after seek 2018-01-12 19:19:59 +02:00
Stanislav Derpoliuk 859976339f Merge pull request #354 from docterd/master
Fixed a SSL Handshaking issue
2018-01-05 17:11:56 +02:00
Stanislav Derpoliuk 8823bbdc15 Merge pull request #383 from derpoliuk/weak-delegate
Make STKAudioPlayer's delegate weak
2017-12-16 07:31:27 +02:00
Stanislav Derpoliuk a6e4ec93bd Merge pull request #377 from derpoliuk/revert-329-master
Revert "Fix playback after seek"
2017-12-16 07:31:15 +02:00
derpoliuk 8e47ee2924 Make STKAudioPlayer's delegate weak 2017-11-09 11:20:27 +02:00
Stanislav Derpoliuk 46a3e67ad0 Revert "Fix playback after seek" 2017-11-09 11:18:19 +02:00
Dennis Oberhoff 06fe1615ed Fixed a SSL Handshaking issue 2017-07-16 21:34:15 +02:00
Thong Nguyen a32ba73a88 Merge pull request #329 from derpoliuk/master
Fix playback after seek
2017-05-10 11:27:12 +01:00
derpoliuk 6d00aa0dff Fix playback after seek (#273)
Use estimated byte offset (if available) instead
of calculated byte offset
2017-03-29 11:44:48 +03:00
4 changed files with 13 additions and 15 deletions
+1 -1
View File
@@ -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'
+1 -1
View File
@@ -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.
+8 -8
View File
@@ -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(&currentEntry->spinLock);
currentEntry->seekTime -= delta;
OSSpinLockUnlock(&currentEntry->spinLock);
if (!error) {
seekByteOffset = packetAlignedByteOffset + currentEntry->audioDataOffset;
if (!(ioFlags & kAudioFileStreamSeekFlag_OffsetIsEstimated)) {
double delta = ((seekByteOffset - (SInt64)currentEntry->audioDataOffset) - packetAlignedByteOffset) / calculatedBitRate * 8;
OSSpinLockLock(&currentEntry->spinLock);
currentEntry->seekTime -= delta;
OSSpinLockUnlock(&currentEntry->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);
}