Update project's version in StreamingKit.podspec

Fix wrong -[STKAudioPlayer progress] after seek

ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -33,41 +33,62 @@
       "minimum-system-version" : "7.0",
       "scale" : "2x"
     },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "filename" : "TX6sV-2.png",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
       "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "TX6sV-1.png",
+      "extent" : "full-screen",
       "subtype" : "retina4",
       "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
     }
   ],
   "info" : {

README.md

@@ -11,7 +11,7 @@ The primary motivation of this project was to decouple the input data sources fr
 * Easy to read source.
 * Carefully multi-threaded to provide a responsive API that won't block your UI thread nor starve the audio buffers.
 * Buffered and gapless playback between all format types.
-* Easy to implement audio data sources (Local, HTTP, AutoRecoveryingHTTP DataSources are provided).
+* Easy to implement audio data sources (Local, HTTP, AutoRecoveringHTTP DataSources are provided).
 * Easy to extend DataSource to support adaptive buffering, encryption, etc.
 * Optimised for low CPU/battery usage (0% - 1% CPU usage when streaming).
 * Optimised for linear data sources. Random access sources are required only for seeking.

StreamingKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "StreamingKit"
-  s.version      = "0.1.26"
+  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'

StreamingKit/StreamingKit/NSMutableArray+STKAudioPlayer.h

@@ -8,10 +8,14 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface NSMutableArray (STKAudioPlayer)
 -(void) enqueue:(id)obj;
 -(void) skipQueue:(id)obj;
 -(void) skipQueueWithQueue:(NSMutableArray*)queue;
--(id) dequeue;
--(id) peek;
+-(nullable id) dequeue;
+-(nullable id) peek;
 @end
+
+NS_ASSUME_NONNULL_END

StreamingKit/StreamingKit/STKAudioPlayer.h

@@ -44,7 +44,9 @@
 #include "UIKit/UIApplication.h"
 #endif
 
-typedef enum
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_OPTIONS(NSInteger, STKAudioPlayerState)
 {
     STKAudioPlayerStateReady,
     STKAudioPlayerStateRunning = 1,
@@ -54,10 +56,9 @@ typedef enum
     STKAudioPlayerStateStopped = (1 << 4),
     STKAudioPlayerStateError = (1 << 5),
     STKAudioPlayerStateDisposed = (1 << 6)
-}
-STKAudioPlayerState;
+};
 
-typedef enum
+typedef NS_ENUM(NSInteger, STKAudioPlayerStopReason)
 {
 	STKAudioPlayerStopReasonNone = 0,
 	STKAudioPlayerStopReasonEof,
@@ -65,10 +66,9 @@ typedef enum
 	STKAudioPlayerStopReasonPendingNext,
 	STKAudioPlayerStopReasonDisposed,
 	STKAudioPlayerStopReasonError = 0xffff
-}
-STKAudioPlayerStopReason;
+};
 
-typedef enum
+typedef NS_ENUM(NSInteger, STKAudioPlayerErrorCode)
 {
 	STKAudioPlayerErrorNone = 0,
 	STKAudioPlayerErrorDataSource,
@@ -77,8 +77,7 @@ typedef enum
     STKAudioPlayerErrorCodecError,
     STKAudioPlayerErrorDataNotFound,
     STKAudioPlayerErrorOther = 0xffff
-}
-STKAudioPlayerErrorCode;
+};
 
 ///
 /// Options to initiailise the Audioplayer with.
@@ -154,13 +153,13 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn
 /// Enables or disables the EQ
 @property (readwrite) BOOL equalizerEnabled;
 /// Returns an array of STKFrameFilterEntry objects representing the filters currently in use
-@property (readonly) NSArray* frameFilters;
+@property (readonly, nullable) NSArray* frameFilters;
 /// Returns the items pending to be played (includes buffering and upcoming items but does not include the current item)
 @property (readonly) NSArray* pendingQueue;
 /// The number of items pending to be played (includes buffering and upcoming items but does not include the current item)
 @property (readonly) NSUInteger pendingQueueCount;
 /// Gets the most recently queued item that is still pending to play
-@property (readonly) NSObject* mostRecentlyQueuedStillPendingItem;
+@property (readonly, nullable) NSObject* mostRecentlyQueuedStillPendingItem;
 /// Gets the current state of the player
 @property (readwrite) STKAudioPlayerState state;
 /// Gets the options provided to the player on startup
@@ -168,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.
@@ -177,10 +176,10 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn
 +(STKDataSource*) dataSourceFromURL:(NSURL*)url;
 
 /// Initializes a new STKAudioPlayer with the default options
--(id) init;
+-(instancetype) init;
 
 /// Initializes a new STKAudioPlayer with the given options
--(id) initWithOptions:(STKAudioPlayerOptions)optionsIn;
+-(instancetype) initWithOptions:(STKAudioPlayerOptions)optionsIn;
 
 /// Plays an item from the given URL string (all pending queued items are removed).
 /// The NSString is used as the queue item ID
@@ -257,7 +256,7 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn
 
 /// Appends a frame filter with the given name and filter block just after the filter with the given name.
 /// If the given name is nil, the filter will be inserted at the beginning of the filter change
--(void) addFrameFilterWithName:(NSString*)name afterFilterWithName:(NSString*)afterFilterWithName block:(STKFrameFilter)block;
+-(void) addFrameFilterWithName:(NSString*)name afterFilterWithName:(nullable NSString*)afterFilterWithName block:(STKFrameFilter)block;
 
 /// Reads the peak power in decibals for the given channel (0 or 1).
 /// Return values are between -60 (low) and 0 (high).
@@ -271,3 +270,5 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn
 -(void) setGain:(float)gain forEqualizerBand:(int)bandIndex;
 
 @end
+
+NS_ASSUME_NONNULL_END

StreamingKit/StreamingKit/STKAudioPlayer.m

@@ -173,7 +173,7 @@ STKAudioPlayerInternalState;
 @end
 
 @implementation STKFrameFilterEntry
--(id) initWithFilter:(STKFrameFilter)filterIn andName:(NSString*)nameIn
+-(instancetype) initWithFilter:(STKFrameFilter)filterIn andName:(NSString*)nameIn
 {
 	if (self = [super init])
 	{
@@ -504,12 +504,12 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
     }
 }
 
--(id) init
+-(instancetype) init
 {
     return [self initWithOptions:(STKAudioPlayerOptions){}];
 }
 
--(id) initWithOptions:(STKAudioPlayerOptions)optionsIn
+-(instancetype) initWithOptions:(STKAudioPlayerOptions)optionsIn
 {
     if (self = [super init])
     {
@@ -628,6 +628,7 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
     pthread_cond_destroy(&mainThreadSyncCallReadyCondition);
     
     free(readBuffer);
+    free(pcmAudioBufferList.mBuffers[0].mData);
 }
 
 -(void) startSystemBackgroundTask
@@ -1496,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);
+            }
         }
     }
     
@@ -1976,9 +1977,8 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
 
     [self destroyAudioConverter];
     
-    canonicalAudioStreamBasicDescription.mChannelsPerFrame = asbd->mChannelsPerFrame;
-    
     BOOL isRecording = currentlyReadingEntry.dataSource.recordToFileUrl != nil;
+    
     if (isRecording)
     {
         recordAudioStreamBasicDescription = (AudioStreamBasicDescription)
@@ -2441,6 +2441,9 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
     }
     else if (!isRunning)
     {
+        stopReason = stopReasonIn;
+        self.internalState = STKAudioPlayerInternalStateStopped;
+
         return;
     }
     

StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.h

@@ -36,6 +36,8 @@
 #import "STKHTTPDataSource.h"
 #import "STKDataSourceWrapper.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 typedef struct
 {
     int watchdogPeriodSeconds;
@@ -45,8 +47,10 @@ STKAutoRecoveringHTTPDataSourceOptions;
 
 @interface STKAutoRecoveringHTTPDataSource : STKDataSourceWrapper
 
--(id) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSource;
+-(instancetype) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSource;
 
 @property (readonly) STKHTTPDataSource* innerDataSource;
 
 @end
+
+NS_ASSUME_NONNULL_END

StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m

@@ -108,17 +108,17 @@ static void PopulateOptionsWithDefault(STKAutoRecoveringHTTPDataSourceOptions* o
     return (STKHTTPDataSource*)self.innerDataSource;
 }
 
--(id) initWithDataSource:(STKDataSource *)innerDataSource
+-(instancetype) initWithDataSource:(STKDataSource *)innerDataSource
 {
     return [self initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSource];
 }
 
--(id) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSourceIn
+-(instancetype) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSourceIn
 {
     return [self initWithHTTPDataSource:innerDataSourceIn andOptions:(STKAutoRecoveringHTTPDataSourceOptions){}];
 }
 
--(id) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSourceIn andOptions:(STKAutoRecoveringHTTPDataSourceOptions)optionsIn
+-(instancetype) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSourceIn andOptions:(STKAutoRecoveringHTTPDataSourceOptions)optionsIn
 {
     if (self = [super initWithDataSource:innerDataSourceIn])
     {

StreamingKit/StreamingKit/STKCoreFoundationDataSource.h

@@ -34,6 +34,8 @@
 
 #import "STKDataSource.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class STKCoreFoundationDataSource;
 
 @interface CoreFoundationDataSourceClientInfo : NSObject
@@ -62,3 +64,5 @@
 -(CFStreamStatus) status;
 
 @end
+
+NS_ASSUME_NONNULL_END

StreamingKit/StreamingKit/STKDataSource.h

@@ -35,6 +35,8 @@
 #import <Foundation/Foundation.h>
 #include <AudioToolbox/AudioToolbox.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class STKDataSource;
 
 @protocol STKDataSourceDelegate<NSObject>
@@ -50,8 +52,8 @@
 @property (readonly) SInt64 length;
 @property (readonly) BOOL hasBytesAvailable;
 @property (nonatomic, readwrite, assign) double durationHint;
-@property (readwrite, unsafe_unretained) id<STKDataSourceDelegate> delegate;
-@property (nonatomic, strong) NSURL *recordToFileUrl;
+@property (readwrite, unsafe_unretained, nullable) id<STKDataSourceDelegate> delegate;
+@property (nonatomic, strong, nullable) NSURL *recordToFileUrl;
 
 -(BOOL) registerForEvents:(NSRunLoop*)runLoop;
 -(void) unregisterForEvents;
@@ -62,3 +64,5 @@
 -(AudioFileTypeID) audioFileTypeHint;
 
 @end
+
+NS_ASSUME_NONNULL_END

StreamingKit/StreamingKit/STKDataSourceWrapper.h

@@ -34,10 +34,14 @@
 
 #import "STKDataSource.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface STKDataSourceWrapper : STKDataSource<STKDataSourceDelegate>
 
--(id) initWithDataSource:(STKDataSource*)innerDataSource;
+-(instancetype) initWithDataSource:(STKDataSource*)innerDataSource;
 
 @property (readonly) STKDataSource* innerDataSource;
 
 @end
+
+NS_ASSUME_NONNULL_END

StreamingKit/StreamingKit/STKDataSourceWrapper.m

@@ -40,7 +40,7 @@
 
 @implementation STKDataSourceWrapper
 
--(id) initWithDataSource:(STKDataSource*)innerDataSourceIn
+-(instancetype) initWithDataSource:(STKDataSource*)innerDataSourceIn
 {
     if (self = [super init])
     {

StreamingKit/StreamingKit/STKHTTPDataSource.h

@@ -34,10 +34,12 @@
 
 #import "STKCoreFoundationDataSource.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class STKHTTPDataSource;
 
 typedef void(^STKURLBlock)(NSURL* url);
-typedef NSURL*(^STKURLProvider)();
+typedef NSURL* _Nonnull (^STKURLProvider)();
 typedef void(^STKAsyncURLProvider)(STKHTTPDataSource* dataSource, BOOL forSeek, STKURLBlock callback);
 
 @interface STKHTTPDataSource : STKCoreFoundationDataSource
@@ -46,11 +48,13 @@ typedef void(^STKAsyncURLProvider)(STKHTTPDataSource* dataSource, BOOL forSeek,
 @property (readonly) UInt32 httpStatusCode;
 
 +(AudioFileTypeID) audioFileTypeHintFromMimeType:(NSString*)fileExtension;
--(id) initWithURL:(NSURL*)url;
--(id) initWithURL:(NSURL *)url httpRequestHeaders:(NSDictionary *)httpRequestHeaders;
--(id) initWithURLProvider:(STKURLProvider)urlProvider;
--(id) initWithAsyncURLProvider:(STKAsyncURLProvider)asyncUrlProvider;
--(NSRunLoop*) eventsRunLoop;
+-(instancetype) initWithURL:(NSURL*)url;
+-(instancetype) initWithURL:(NSURL*)url httpRequestHeaders:(NSDictionary*)httpRequestHeaders;
+-(instancetype) initWithURLProvider:(STKURLProvider)urlProvider;
+-(instancetype) initWithAsyncURLProvider:(STKAsyncURLProvider)asyncUrlProvider;
+-(nullable NSRunLoop*) eventsRunLoop;
 -(void) reconnect;
 
 @end
+
+NS_ASSUME_NONNULL_END

StreamingKit/StreamingKit/STKHTTPDataSource.m

@@ -64,19 +64,19 @@
 
 @implementation STKHTTPDataSource
 
--(id) initWithURL:(NSURL*)urlIn
+-(instancetype) initWithURL:(NSURL*)urlIn
 {
     return [self initWithURLProvider:^NSURL* { return urlIn; }];
 }
 
--(id) initWithURL:(NSURL *)urlIn httpRequestHeaders:(NSDictionary *)httpRequestHeaders
+-(instancetype) initWithURL:(NSURL *)urlIn httpRequestHeaders:(NSDictionary *)httpRequestHeaders
 {
     self = [self initWithURLProvider:^NSURL* { return urlIn; }];
     self->requestHeaders = httpRequestHeaders;
     return self;
 }
 
--(id) initWithURLProvider:(STKURLProvider)urlProviderIn
+-(instancetype) initWithURLProvider:(STKURLProvider)urlProviderIn
 {
 	urlProviderIn = [urlProviderIn copy];
     
@@ -86,7 +86,7 @@
     }];
 }
 
--(id) initWithAsyncURLProvider:(STKAsyncURLProvider)asyncUrlProviderIn
+-(instancetype) initWithAsyncURLProvider:(STKAsyncURLProvider)asyncUrlProviderIn
 {
     if (self = [super init])
     {
@@ -411,7 +411,7 @@
     
     eventsRunLoop = savedEventsRunLoop;
 	
-    [self seekToOffset:self.position];
+    [self seekToOffset:self->supportsSeek ? self.position : 0];
 }
 
 -(void) seekToOffset:(SInt64)offset
@@ -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);
         }
 

StreamingKit/StreamingKit/STKLocalFileDataSource.h

@@ -34,10 +34,14 @@
 
 #import "STKCoreFoundationDataSource.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface STKLocalFileDataSource : STKCoreFoundationDataSource
 
 +(AudioFileTypeID) audioFileTypeHintFromFileExtension:(NSString*)fileExtension;
 @property (readonly, copy) NSString* filePath;
--(id) initWithFilePath:(NSString*)filePath;
+-(instancetype) initWithFilePath:(NSString*)filePath;
 
 @end
+
+NS_ASSUME_NONNULL_END

StreamingKit/StreamingKit/STKLocalFileDataSource.m

@@ -47,7 +47,7 @@
 @implementation STKLocalFileDataSource
 @synthesize filePath;
 
--(id) initWithFilePath:(NSString*)filePathIn
+-(instancetype) initWithFilePath:(NSString*)filePathIn
 {
     if (self = [super init])
     {

StreamingKit/StreamingKit/STKQueueEntry.h

@@ -10,6 +10,8 @@
 #import "libkern/OSAtomic.h"
 #import "AudioToolbox/AudioToolbox.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface STKQueueEntry : NSObject
 {
 @public
@@ -35,7 +37,7 @@
 @property (readwrite, retain) NSObject* queueItemId;
 @property (readwrite, retain) STKDataSource* dataSource;
 
--(id) initWithDataSource:(STKDataSource*)dataSource andQueueItemId:(NSObject*)queueItemId;
+-(instancetype) initWithDataSource:(STKDataSource*)dataSource andQueueItemId:(NSObject*)queueItemId;
 
 -(void) reset;
 -(double) duration;
@@ -43,4 +45,6 @@
 -(double) calculatedBitRate;
 -(BOOL) isDefinitelyCompatible:(AudioStreamBasicDescription*)basicDescription;
 
-@end
+@end
+
+NS_ASSUME_NONNULL_END

StreamingKit/StreamingKit/STKQueueEntry.m

@@ -14,7 +14,7 @@
 
 @implementation STKQueueEntry
 
--(id) initWithDataSource:(STKDataSource*)dataSourceIn andQueueItemId:(NSObject*)queueItemIdIn
+-(instancetype) initWithDataSource:(STKDataSource*)dataSourceIn andQueueItemId:(NSObject*)queueItemIdIn
 {
     if (self = [super init])
     {
@@ -46,7 +46,7 @@
 	{
 		if (processedPacketsCount > STK_BIT_RATE_ESTIMATION_MIN_PACKETS_PREFERRED || (audioStreamBasicDescription.mBytesPerFrame == 0 && processedPacketsCount > STK_BIT_RATE_ESTIMATION_MIN_PACKETS_MIN))
 		{
-			double averagePacketByteSize = processedPacketsSizeTotal / processedPacketsCount;
+			double averagePacketByteSize = (double)processedPacketsSizeTotal / (double)processedPacketsCount;
 			
 			retval = averagePacketByteSize / packetDuration * 8;
 			
@@ -110,7 +110,7 @@
 -(Float64) progressInFrames
 {
     OSSpinLockLock(&self->spinLock);
-    Float64 retval = self->seekTime + self->framesPlayed;
+    Float64 retval = (self->seekTime + self->audioStreamBasicDescription.mSampleRate) + self->framesPlayed;
     OSSpinLockUnlock(&self->spinLock);
     
     return retval;
@@ -121,4 +121,4 @@
     return [[self queueItemId] description];
 }
 
-@end
+@end