clean up and formatting

Author: jessesquires

JSQSystemSoundPlayer/JSQSystemSoundPlayer/JSQSystemSoundPlayer.h

@@ -184,7 +184,8 @@ typedef void(^JSQSystemSoundPlayerCompletionBlock)(void);
  *  This parameter must be one of `kJSQSystemSoundTypeCAF`, `kJSQSystemSoundTypeAIF`, `kJSQSystemSoundTypeAIFF`, or `kJSQSystemSoundTypeWAV`.
  *
  */
-- (void)preloadSoundWithFilename:(NSString *)filename fileExtension:(NSString *)fileExtension;
+- (void)preloadSoundWithFilename:(NSString *)filename
+                   fileExtension:(NSString *)fileExtension;
 
 @end
 

JSQSystemSoundPlayer/JSQSystemSoundPlayer/JSQSystemSoundPlayer.m

@@ -32,39 +32,15 @@
 NSString * const kJSQSystemSoundTypeAIFF = @"aiff";
 NSString * const kJSQSystemSoundTypeWAV = @"wav";
 
-@interface JSQSystemSoundPlayer ()
-
-@property (strong, nonatomic) NSMutableDictionary *sounds;
-@property (strong, nonatomic) NSMutableDictionary *completionBlocks;
-
-- (void)playSoundWithName:(NSString *)filename
-                extension:(NSString *)extension
-                  isAlert:(BOOL)isAlert
-          completionBlock:(JSQSystemSoundPlayerCompletionBlock)completionBlock;
 
-- (BOOL)readSoundPlayerOnFromUserDefaults;
-
-- (NSData *)dataWithSoundID:(SystemSoundID)soundID;
-- (SystemSoundID)soundIDFromData:(NSData *)data;
+@interface JSQSystemSoundPlayer ()
 
-- (SystemSoundID)soundIDForFilename:(NSString *)filenameKey;
-- (void)addSoundIDForAudioFileWithName:(NSString *)filename
-                             extension:(NSString *)extension;
+@property (strong, nonatomic, readonly) NSMutableDictionary *sounds;
+@property (strong, nonatomic, readonly) NSMutableDictionary *completionBlocks;
 
 - (JSQSystemSoundPlayerCompletionBlock)completionBlockForSoundID:(SystemSoundID)soundID;
-- (void)addCompletionBlock:(JSQSystemSoundPlayerCompletionBlock)block
-                 toSoundID:(SystemSoundID)soundID;
-- (void)removeCompletionBlockForSoundID:(SystemSoundID)soundID;
-
-- (SystemSoundID)createSoundIDWithName:(NSString *)filename
-                             extension:(NSString *)extension;
-
-- (void)unloadSoundIDs;
-- (void)unloadSoundIDForFileNamed:(NSString *)filename;
-
-- (void)logError:(OSStatus)error withMessage:(NSString *)message;
 
-- (void)didReceiveMemoryWarningNotification:(NSNotification *)notification;
+- (void)removeCompletionBlockForSoundID:(SystemSoundID)soundID;
 
 @end
 
@@ -134,6 +110,7 @@ - (void)dealloc
     _bundle = nil;
 }
 
+
 #pragma mark - Setters
 
 - (void)setBundle:(NSBundle *)bundle
@@ -142,6 +119,7 @@ - (void)setBundle:(NSBundle *)bundle
     _bundle = bundle;
 }
 
+
 #pragma mark - Playing sounds
 
 - (void)playSoundWithName:(NSString *)filename
@@ -198,6 +176,7 @@ - (BOOL)readSoundPlayerOnFromUserDefaults
     return [setting boolValue];
 }
 
+
 #pragma mark - Public API
 
 - (void)toggleSoundPlayerOn:(BOOL)on
@@ -270,6 +249,7 @@ - (void)preloadSoundWithFilename:(NSString *)filename fileExtension:(NSString *)
     }
 }
 
+
 #pragma mark - Sound data
 
 - (NSData *)dataWithSoundID:(SystemSoundID)soundID
@@ -288,11 +268,12 @@ - (SystemSoundID)soundIDFromData:(NSData *)data
     return soundID;
 }
 
+
 #pragma mark - Sound files
 
 - (SystemSoundID)soundIDForFilename:(NSString *)filenameKey
 {
-    NSData *soundData = [self.sounds objectForKey:filenameKey];
+    NSData *soundData = [_sounds objectForKey:filenameKey];
     return [self soundIDFromData:soundData];
 }
 
@@ -307,6 +288,7 @@ - (void)addSoundIDForAudioFileWithName:(NSString *)filename
     }
 }
 
+
 #pragma mark - Sound completion blocks
 
 - (JSQSystemSoundPlayerCompletionBlock)completionBlockForSoundID:(SystemSoundID)soundID
@@ -329,6 +311,7 @@ - (void)removeCompletionBlockForSoundID:(SystemSoundID)soundID
     AudioServicesRemoveSystemSoundCompletion(soundID);
 }
 
+
 #pragma mark - Managing sounds
 
 - (SystemSoundID)createSoundIDWithName:(NSString *)filename
@@ -402,6 +385,7 @@ - (void)logError:(OSStatus)error withMessage:(NSString *)message
     NSLog(@"[%@] %@ Error: (code %d) %@", [self class], message, (int)error, errorMessage);
 }
 
+
 #pragma mark - Notifications
 
 - (void)didReceiveMemoryWarningNotification:(NSNotification *)notification