From 25571f9830733626306214843e35dcb37fcb7a7d Mon Sep 17 00:00:00 2001 From: Alexey Blinov Date: Mon, 8 Apr 2013 18:14:44 +0100 Subject: [PATCH 1/4] Fixed AudioPlayer incorrectly setting the internal state to Stopping when playing two incompatible items one after another. --- Audjustable/Classes/AudioPlayer/AudioPlayer.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Audjustable/Classes/AudioPlayer/AudioPlayer.m b/Audjustable/Classes/AudioPlayer/AudioPlayer.m index 8ec9af3..26cef02 100644 --- a/Audjustable/Classes/AudioPlayer/AudioPlayer.m +++ b/Audjustable/Classes/AudioPlayer/AudioPlayer.m @@ -1410,7 +1410,11 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ if (currentlyReadingEntry == nil) { - self.internalState = AudioPlayerInternalStateStopping; + if (upcomingQueue.count == 0) + { + stopReason = AudioPlayerStopReasonNoStop; + self.internalState = AudioPlayerInternalStateStopping; + } } if (nextIsDifferent && entry) From 7dca2e55ac4ba5908a9f7572737a4c293c47fa3a Mon Sep 17 00:00:00 2001 From: Thong Nguyen Date: Mon, 8 Apr 2013 20:20:09 +0100 Subject: [PATCH 2/4] Fix memory leak in HttpDataSource:dataAvailable --- Audjustable/Classes/AudioPlayer/HttpDataSource.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Audjustable/Classes/AudioPlayer/HttpDataSource.m b/Audjustable/Classes/AudioPlayer/HttpDataSource.m index 9c482b1..2839743 100644 --- a/Audjustable/Classes/AudioPlayer/HttpDataSource.m +++ b/Audjustable/Classes/AudioPlayer/HttpDataSource.m @@ -107,7 +107,7 @@ { CFTypeRef copyPropertyMessage = CFReadStreamCopyProperty(stream, kCFStreamPropertyHTTPResponseHeader); - httpHeaders = (__bridge NSDictionary*)CFHTTPMessageCopyAllHeaderFields((CFHTTPMessageRef)copyPropertyMessage); + httpHeaders = (__bridge_transfer NSDictionary*)CFHTTPMessageCopyAllHeaderFields((CFHTTPMessageRef)copyPropertyMessage); CFRelease(copyPropertyMessage); From 79d10321ebb3fd2457e8a81ec0b9d3134dd79949 Mon Sep 17 00:00:00 2001 From: Thong Nguyen Date: Mon, 8 Apr 2013 20:41:16 +0100 Subject: [PATCH 3/4] Added missing test app and static lib project schemes --- .../Audjustable Test Project.xcscheme | 86 +++++++++++++++++++ .../audjustable static library.xcscheme | 59 +++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 Audjustable.xcodeproj/xcshareddata/xcschemes/Audjustable Test Project.xcscheme create mode 100644 Audjustable.xcodeproj/xcshareddata/xcschemes/audjustable static library.xcscheme diff --git a/Audjustable.xcodeproj/xcshareddata/xcschemes/Audjustable Test Project.xcscheme b/Audjustable.xcodeproj/xcshareddata/xcschemes/Audjustable Test Project.xcscheme new file mode 100644 index 0000000..62da42b --- /dev/null +++ b/Audjustable.xcodeproj/xcshareddata/xcschemes/Audjustable Test Project.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Audjustable.xcodeproj/xcshareddata/xcschemes/audjustable static library.xcscheme b/Audjustable.xcodeproj/xcshareddata/xcschemes/audjustable static library.xcscheme new file mode 100644 index 0000000..9b91159 --- /dev/null +++ b/Audjustable.xcodeproj/xcshareddata/xcschemes/audjustable static library.xcscheme @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From bed5fe1f0457c6c2e86509936de90217c701efb0 Mon Sep 17 00:00:00 2001 From: Thong Nguyen Date: Wed, 10 Apr 2013 12:28:38 +0100 Subject: [PATCH 4/4] Updated podspec for version 0.0.3 --- Audjustable.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Audjustable.podspec b/Audjustable.podspec index d930772..26d228b 100644 --- a/Audjustable.podspec +++ b/Audjustable.podspec @@ -1,11 +1,11 @@ Pod::Spec.new do |s| s.name = "Audjustable" - s.version = "0.0.2" + s.version = "0.0.3" 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}'