From 188f880f5afa874ec87f263ec79d1181709785cb Mon Sep 17 00:00:00 2001
From: Thong Nguyen <tumtumtum@gmail.com>
Date: Fri, 14 Feb 2014 22:19:41 +0000
Subject: [PATCH] Tidied up some warnings

---
 StreamingKit/StreamingKit/STKAudioPlayer.h |  2 +-
 StreamingKit/StreamingKit/STKAudioPlayer.m | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.h b/StreamingKit/StreamingKit/STKAudioPlayer.h
index f1d3cd5..a5a9cad 100644
--- a/StreamingKit/StreamingKit/STKAudioPlayer.h
+++ b/StreamingKit/StreamingKit/STKAudioPlayer.h
@@ -38,7 +38,7 @@
 #import <Foundation/Foundation.h>
 #import <pthread.h>
 #import "STKDataSource.h"
-#include <AudioToolbox/AudioToolbox.h>
+#import <AudioToolbox/AudioToolbox.h>
 
 #if TARGET_OS_IPHONE
 #include "UIKit/UIApplication.h"
diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m
index cb444ba..c5428da 100644
--- a/StreamingKit/StreamingKit/STKAudioPlayer.m
+++ b/StreamingKit/StreamingKit/STKAudioPlayer.m
@@ -83,6 +83,12 @@ static void PopulateOptionsWithDefault(STKAudioPlayerOptions* options)
     }
 }
 
+#define CHECK_STATUS_AND_REPORT(call) \
+	if ((status = (call))) \
+	{ \
+		[self unexpectedError:STKAudioPlayerErrorAudioSystemError]; \
+	}
+
 #define CHECK_STATUS_AND_RETURN(call) \
 	if ((status = (call))) \
 	{ \
@@ -2039,7 +2045,7 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
 		
         CHECK_STATUS_AND_RETURN(AUGraphSetNodeInputCallback(audioGraph, converterNode, 0, &callbackStruct));
 		
-		status = AUGraphConnectNodeInput(audioGraph, converterNode, 0, firstNode, 0);
+		CHECK_STATUS_AND_RETURN(AUGraphConnectNodeInput(audioGraph, converterNode, 0, firstNode, 0));
 	}
 	else
 	{
@@ -2076,7 +2082,7 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
     
     for (NSNumber* converterNode in converterNodes)
     {
-        status = AUGraphRemoveNode(audioGraph, (AUNode)converterNode.intValue);
+        CHECK_STATUS_AND_REPORT(AUGraphRemoveNode(audioGraph, (AUNode)converterNode.intValue));
     }
     
     [converterNodes removeAllObjects];