project_files/HedgewarsMobile/Classes/AudioManagerController.m
branchios-develop
changeset 12872 00215a7ec5f5
parent 10108 c68cf030eded
--- a/project_files/HedgewarsMobile/Classes/AudioManagerController.m	Fri Dec 29 22:37:31 2017 +0100
+++ b/project_files/HedgewarsMobile/Classes/AudioManagerController.m	Sat Dec 30 01:22:11 2017 +0100
@@ -37,7 +37,7 @@
     return mainInstance;
 }
 
--(id) init {
+- (id)init {
     if ((self = [super init])) {
         self.backgroundMusic = nil;
         self.clickSound = -1;
@@ -49,15 +49,12 @@
     return self;
 }
 
--(void) dealloc {
+- (void)dealloc {
     [self unloadSounds];
-    releaseAndNil(backgroundMusic);
-    releaseAndNil(audioFaderQueue);
     mainInstance = nil;
-    [super dealloc];
 }
 
--(void) didReceiveMemoryWarning {
+- (void)didReceiveMemoryWarning {
     if (self.backgroundMusic.playing == NO)
         self.backgroundMusic = nil;
     if ([self.audioFaderQueue operationCount] == 0)
@@ -69,7 +66,7 @@
 
 #pragma mark -
 #pragma mark background music control
--(void) playBackgroundMusic {
+- (void)playBackgroundMusic {
     if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"music"] boolValue] == NO)
         return;
 
@@ -84,15 +81,15 @@
     [self.backgroundMusic play];
 }
 
--(void) pauseBackgroundMusic {
+- (void)pauseBackgroundMusic {
     [self.backgroundMusic pause];
 }
 
--(void) stopBackgroundMusic {
+- (void)stopBackgroundMusic {
     [self.backgroundMusic stop];
 }
 
--(void) fadeOutBackgroundMusic {
+- (void)fadeOutBackgroundMusic {
     if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"music"] boolValue] == NO)
         return;
 
@@ -103,10 +100,9 @@
                                                                                              toVolume:0.0
                                                                                          overDuration:FADEOUT_DURATION];
     [self.audioFaderQueue addOperation:fadeOut];
-    [fadeOut release];
 }
 
--(void) fadeInBackgroundMusic {
+- (void)fadeInBackgroundMusic {
     if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"music"] boolValue] == NO)
         return;
 
@@ -118,7 +114,6 @@
                                                                                             toVolume:DEFAULT_VOLUME
                                                                                         overDuration:FADEIN_DURATION];
     [audioFaderQueue addOperation:fadeIn];
-    [fadeIn release];
 }
 
 #pragma mark -
@@ -131,17 +126,17 @@
     NSURL *filePath = [NSURL fileURLWithPath:path isDirectory:NO];
 
     // use audio sevices to create and play the sound
-    AudioServicesCreateSystemSoundID((CFURLRef)filePath, &soundID);
+    AudioServicesCreateSystemSoundID((__bridge CFURLRef)filePath, &soundID);
     return soundID;
 }
 
--(void) unloadSounds {
+- (void)unloadSounds {
     AudioServicesDisposeSystemSoundID(clickSound), clickSound = -1;
     AudioServicesDisposeSystemSoundID(backSound), backSound = -1;
     AudioServicesDisposeSystemSoundID(selSound), selSound = -1;
 }
 
--(void) playClickSound {
+- (void)playClickSound {
     if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"sound"] boolValue] == NO)
         return;
 
@@ -151,7 +146,7 @@
     AudioServicesPlaySystemSound(self.clickSound);
 }
 
--(void) playBackSound {
+- (void)playBackSound {
     if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"sound"] boolValue] == NO)
         return;
 
@@ -161,7 +156,7 @@
     AudioServicesPlaySystemSound(self.backSound);
 }
 
--(void) playSelectSound {
+- (void)playSelectSound {
     if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"sound"] boolValue] == NO)
         return;