Merge branch 'master' of https://github.com/tumtumtum/audjustable

Some format fixes
Merge pull request #20 from gangverk/master
2013-04-17 13:07:51 +01:00 · 2013-04-17 13:07:48 +01:00 · 2013-04-17 05:06:26 -07:00 · 2013-04-17 03:14:06 -07:00 · 2013-04-17 10:12:07 +00:00 · 2013-04-17 10:11:18 +00:00
2 changed files with 7 additions and 6 deletions
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
  s.name         = "Audjustable"
-  s.version      = "0.0.2"
+  s.version      = "0.0.4"
  s.summary      = "A fast and extensible audio streamer for iOS and OSX with support for gapless playback and custom (non-HTTP) sources."
  s.homepage     = "http://tumtumtum.github.com/audjustable/"
  s.license      = 'MIT'
  s.author       = { "Thong Nguyen" => "tumtumtum@gmail.com" }
-  s.source       = { :git => "https://github.com/gangverk/audjustable.git", :tag => s.version.to_s}
+  s.source       = { :git => "https://github.com/tumtumtum/audjustable.git", :tag => s.version.to_s}
  s.platform     = :ios
  s.requires_arc = true
  s.source_files = 'Audjustable/Classes/AudioPlayer/*.{h,m}'
@@ -1024,10 +1024,10 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
            }
        }
        
-        if (self.internalState == AudioPlayerInternalStateRebuffering && numberOfBuffersUsed >= AudioPlayerBuffersNeededToStart) {
-            self.internalState =AudioPlayerInternalStatePlaying;
+        if (self.internalState == AudioPlayerInternalStateRebuffering && numberOfBuffersUsed >= AudioPlayerBuffersNeededToStart)
+        {
+            self.internalState = AudioPlayerInternalStatePlaying;
        }
-
        
        if (++fillBufferIndex >= audioQueueBufferCount)
        {
@@ -1636,7 +1636,8 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
 				break;
 			}

-			[playbackThreadRunLoop runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:10]];
+			NSDate *date = [[NSDate alloc] initWithTimeIntervalSinceNow:10];
+			[playbackThreadRunLoop runMode:NSDefaultRunLoopMode beforeDate:date];
 		}
 		
 		disposeWasRequested = NO;
Author	SHA1	Message	Date
Thong Nguyen	02e87c1221	Merge branch 'master' of https://github.com/tumtumtum/audjustable	2013-04-17 13:07:51 +01:00
Thong Nguyen	d52c012514	Some format fixes	2013-04-17 13:07:48 +01:00
Thong Nguyen	ea64e5cd71	Merge pull request #20 from gangverk/master Continual allocation of NSDate objects in [AudioPlayer startInterval]	2013-04-17 05:06:26 -07:00
Piers	7a7ba985b8	Merge pull request #2 from gangverk/bugfix/continuous-date-allocation Bugfix/continuous date allocation	2013-04-17 03:14:06 -07:00
Piers	91640f6207	Update podspec version	2013-04-17 10:12:07 +00:00
Piers	4a60b768be	Merge branch 'master' into bugfix/continuous-date-allocation	2013-04-17 10:11:18 +00:00
Piers	6d5fdd2450	Merge pull request #1 from gangverk/bugfix/continuous-date-allocation Fix continual allocation of auto-releaseable NSDate objects	2013-04-17 02:53:33 -07:00
Piers	4e019bfcf2	Fix continual allocation of auto-releaseable NSDate objects The startInterval method of the AudioPlayer module causes a continually increasing number of NSDate objects to be allocated. The auto-release pool which wraps this code doesn't drain frequently enough causing an application's memory footprint to grow by roughly a megabyte every 5 minutes.	2013-04-17 09:37:57 +00:00
Thong Nguyen	bed5fe1f04	Updated podspec for version 0.0.3	2013-04-10 12:28:38 +01:00