Fixed bug in progressInFrames

Merge pull request #175 from sergiou87/master
Paused Audio Player doesn't transit to Stopped state on stop
2015-12-11 01:06:53 +00:00 · 2015-12-11 01:02:14 +00:00 · 2015-12-07 13:02:44 +00:00 · 2015-12-07 13:00:53 +00:00 · 2015-12-07 12:59:32 +00:00 · 2015-12-06 14:00:49 +00:00
7 changed files with 63 additions and 41 deletions
@@ -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" : {
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name         = "StreamingKit"
-  s.version      = "0.1.26"
+  s.version      = "0.1.28"
  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'
@@ -44,7 +44,7 @@
 #include "UIKit/UIApplication.h"
 #endif

-typedef enum
+typedef NS_OPTIONS(NSInteger, STKAudioPlayerState)
 {
    STKAudioPlayerStateReady,
    STKAudioPlayerStateRunning = 1,
@@ -54,10 +54,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 +64,9 @@ typedef enum
 	STKAudioPlayerStopReasonPendingNext,
 	STKAudioPlayerStopReasonDisposed,
 	STKAudioPlayerStopReasonError = 0xffff
-}
-STKAudioPlayerStopReason;
+};

-typedef enum
+typedef NS_ENUM(NSInteger, STKAudioPlayerErrorCode)
 {
 	STKAudioPlayerErrorNone = 0,
 	STKAudioPlayerErrorDataSource,
@@ -77,8 +75,7 @@ typedef enum
    STKAudioPlayerErrorCodecError,
    STKAudioPlayerErrorDataNotFound,
    STKAudioPlayerErrorOther = 0xffff
-}
-STKAudioPlayerErrorCode;
+};

 ///
 /// Options to initiailise the Audioplayer with.
@@ -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
@@ -2441,6 +2442,9 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
    }
    else if (!isRunning)
    {
+        stopReason = stopReasonIn;
+        self.internalState = STKAudioPlayerInternalStateStopped;
+
        return;
    }
    
@@ -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;
Author	SHA1	Message	Date
Thong Nguyen	d8b77ae214	Fixed bug in progressInFrames	2015-12-11 01:06:53 +00:00
Thong Nguyen	499e54731d	Merge pull request #175 from sergiou87/master Paused Audio Player doesn't transit to Stopped state on stop	2015-12-11 01:02:14 +00:00
Thong Nguyen	da71b04aaf	Updated version number in podspec	2015-12-07 13:02:44 +00:00
Thong Nguyen	55a314b966	Fix int->double truncation when doing duration calculation	2015-12-07 13:00:53 +00:00
Thong Nguyen	8fa821a944	Fixed int->double truncation in duration calculation	2015-12-07 12:59:32 +00:00
Thong Nguyen	0f69b7ea76	Merge pull request #239 from reindernijhoff/master Fixed memory leak	2015-12-06 14:00:49 +00:00
Reinder Nijhoff	4d0fccdd70	Fixed memory leak	2015-12-06 14:06:15 +01:00
Thong Nguyen	5909657368	Changed enums to NS_ENUM to better support Swift. Added launch images to remove warnings	2015-12-04 22:47:14 +00:00
Sergio Padrino	de99ec9d7a	Make sure the audio player changes to stopped state when it's stopped from paused state	2015-01-14 16:56:06 +01:00