Updated Audjustable.podspec to 0.0.9

Adding level metering APIs. Adding casts to get rid of Xcode warnings.

Audjustable.podspec

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

Audjustable.xcodeproj/project.pbxproj

@@ -67,7 +67,7 @@
 		A186B4F2157F80E700BD0084 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		A186B4F3157F80E700BD0084 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		A186B500157F813100BD0084 /* AudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioPlayer.h; sourceTree = "<group>"; };
-		A186B501157F813100BD0084 /* AudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioPlayer.m; sourceTree = "<group>"; };
+		A186B501157F813100BD0084 /* AudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioPlayer.m; sourceTree = "<group>"; wrapsLines = 1; };
 		A186B502157F813100BD0084 /* CoreFoundationDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreFoundationDataSource.h; sourceTree = "<group>"; };
 		A186B503157F813100BD0084 /* CoreFoundationDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoreFoundationDataSource.m; sourceTree = "<group>"; };
 		A186B504157F813100BD0084 /* DataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataSource.h; sourceTree = "<group>"; };
@@ -247,7 +247,7 @@
 		A186B4D6157F80E600BD0084 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0500;
 			};
 			buildConfigurationList = A186B4D9157F80E600BD0084 /* Build configuration list for PBXProject "Audjustable" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -371,9 +371,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -388,10 +389,14 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -401,9 +406,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -411,8 +417,11 @@
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";

Audjustable.xcodeproj/project.xcworkspace/xcshareddata/Audjustable.xccheckout

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>0082CB9A-521A-4A1D-A18C-AEBEDF2DF227</string>
+	<key>IDESourceControlProjectName</key>
+	<string>Audjustable</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>39F64986-79A8-40D3-9B3C-3C7711576969</key>
+		<string>https://github.com/tumtumtum/audjustable.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>Audjustable.xcodeproj/project.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>39F64986-79A8-40D3-9B3C-3C7711576969</key>
+		<string>../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>https://github.com/tumtumtum/audjustable.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>39F64986-79A8-40D3-9B3C-3C7711576969</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>39F64986-79A8-40D3-9B3C-3C7711576969</string>
+			<key>IDESourceControlWCCName</key>
+			<string>audjustable</string>
+		</dict>
+	</array>
+</dict>
+</plist>

Audjustable.xcodeproj/xcshareddata/xcschemes/Audjustable Test Project.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Audjustable.xcodeproj/xcshareddata/xcschemes/audjustable static library.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Audjustable/Classes/AudioPlayer/AudioPlayer.h

@@ -172,6 +172,10 @@ AudioQueueBufferRefLookupEntry;
     volatile BOOL audioQueueFlushing;
     volatile SInt64 audioPacketsReadCount;
     volatile SInt64 audioPacketsPlayedCount;
+
+    BOOL meteringEnabled;
+    AudioQueueLevelMeterState* levelMeterState;
+    NSInteger numberOfChannels;
 }
 
 @property (readonly) double duration;
@@ -179,6 +183,7 @@ AudioQueueBufferRefLookupEntry;
 @property (readwrite) AudioPlayerState state;
 @property (readonly) AudioPlayerStopReason stopReason;
 @property (readwrite, unsafe_unretained) id<AudioPlayerDelegate> delegate;
+@property (readwrite) BOOL meteringEnabled;
 
 -(id) init;
 -(id) initWithNumberOfAudioQueueBuffers:(int)numberOfAudioQueueBuffers andReadBufferSize:(int)readBufferSizeIn;
@@ -195,5 +200,8 @@ AudioQueueBufferRefLookupEntry;
 -(void) unmute;
 -(void) dispose;
 -(NSObject*) currentlyPlayingQueueItemId;
+-(void) updateMeters;
+-(float) peakPowerInDecibelsForChannel:(NSUInteger)channelNumber;
+-(float) averagePowerInDecibelsForChannel:(NSUInteger)channelNumber;
 
 @end

Audjustable/Classes/AudioPlayer/AudioPlayer.m

@@ -451,6 +451,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
     free(packetDescs);
     free(audioQueueBuffer);
     free(audioQueueBufferLookup);
+    free(levelMeterState);
 }
 
 -(void) startSystemBackgroundTask
@@ -733,7 +734,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
             
             if (currentlyReadingEntry->processedPacketsSizeTotal < 0xfffff)
             {
-                OSAtomicAdd32(packetSize, &currentlyReadingEntry->processedPacketsSizeTotal);
+                OSAtomicAdd32((int32_t)packetSize, &currentlyReadingEntry->processedPacketsSizeTotal);
                 OSAtomicIncrement32(&currentlyReadingEntry->processedPacketsCount);
             }
             
@@ -1215,6 +1216,10 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
     
     AudioQueueSetParameter(audioQueue, kAudioQueueParam_Volume, 1);
     
+    // Reset metering enabled in case the user set it before the queue was created
+    
+    [self setMeteringEnabled:meteringEnabled];
+
     free(cookieData);
 }
 
@@ -2179,4 +2184,77 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
     return retval;
 }
 
+#pragma mark Metering
+
+-(void) setMeteringEnabled:(BOOL)value
+{
+    if (!audioQueue)
+    {
+        meteringEnabled = value;
+        
+        return;
+    }
+    
+    UInt32 on = value ? 1 : 0;
+    OSStatus error = AudioQueueSetProperty(audioQueue, kAudioQueueProperty_EnableLevelMetering, &on, sizeof(on));
+    
+    if (error)
+    {
+        meteringEnabled = NO;
+    }
+    else
+    {
+        meteringEnabled = YES;
+    }
+}
+
+-(BOOL) meteringEnabled
+{
+    return meteringEnabled;
+}
+
+-(void) updateMeters
+{
+    if (!meteringEnabled)
+    {
+        NSAssert(NO, @"Metering is not enabled. Make sure to set meteringEnabled = YES.");
+    }
+
+    NSInteger channels = currentAudioStreamBasicDescription.mChannelsPerFrame;
+    
+    if (numberOfChannels != channels)
+    {
+        numberOfChannels = channels;
+        
+        if (levelMeterState) free(levelMeterState);
+        {
+            levelMeterState = malloc(sizeof(AudioQueueLevelMeterState) * numberOfChannels);
+        }
+    }
+
+    UInt32 sizeofMeters = sizeof(AudioQueueLevelMeterState) * numberOfChannels;
+
+    AudioQueueGetProperty(audioQueue, kAudioQueueProperty_CurrentLevelMeterDB, levelMeterState, &sizeofMeters);
+}
+
+-(float) peakPowerInDecibelsForChannel:(NSUInteger)channelNumber
+{
+    if (!meteringEnabled || !levelMeterState || (channelNumber > numberOfChannels))
+    {
+        return 0;
+    }
+    
+    return levelMeterState[channelNumber].mPeakPower;
+}
+
+-(float) averagePowerInDecibelsForChannel:(NSUInteger)channelNumber
+{
+    if (!meteringEnabled || !levelMeterState || (channelNumber > numberOfChannels))
+    {
+        return 0;
+    }
+    
+    return levelMeterState[channelNumber].mAveragePower;
+}
+
 @end

Audjustable/Classes/AudioPlayer/HttpDataSource.m

@@ -153,7 +153,7 @@
     
     stream = 0;
     relativePosition = 0;
-    seekStart = offset;
+    seekStart = (int)offset;
     
     [self open];
     [self reregisterForEvents];