project_files/HedgewarsMobile/Classes/MXAudioPlayerFadeOperation.m
branchios-develop
changeset 12872 00215a7ec5f5
parent 11137 14f50dde3e8c
--- a/project_files/HedgewarsMobile/Classes/MXAudioPlayerFadeOperation.m	Fri Dec 29 22:37:31 2017 +0100
+++ b/project_files/HedgewarsMobile/Classes/MXAudioPlayerFadeOperation.m	Sat Dec 30 01:22:11 2017 +0100
@@ -10,7 +10,7 @@
 #define SKVolumeChangesPerSecond 15
 
 @interface MXAudioPlayerFadeOperation ()
-@property (nonatomic, retain, readwrite) AVAudioPlayer *audioPlayer;
+@property (nonatomic, strong, readwrite) AVAudioPlayer *audioPlayer;
 - (void)beginFadeOperation;
 - (void)finishFadeOperation;
 @end
@@ -31,23 +31,22 @@
 - (AVAudioPlayer *)audioPlayer {
   AVAudioPlayer *result;
   @synchronized(self) {
-    result = [_audioPlayer retain];
+    result = _audioPlayer;
   }
-  return [result autorelease];
+  return result;
 }
 
 - (void)setAudioPlayer:(AVAudioPlayer *)anAudioPlayer {
   @synchronized(self) {
     if (_audioPlayer != anAudioPlayer) {
-      [_audioPlayer release];
-      _audioPlayer = [anAudioPlayer retain];
+      _audioPlayer = anAudioPlayer;
     }
   }
 }
 
 #pragma mark -
 #pragma mark NSOperation
--(id) initFadeWithAudioPlayer:(AVAudioPlayer*)player toVolume:(float)volume overDuration:(NSTimeInterval)duration withDelay:(NSTimeInterval)timeDelay {
+- (id)initFadeWithAudioPlayer:(AVAudioPlayer*)player toVolume:(float)volume overDuration:(NSTimeInterval)duration withDelay:(NSTimeInterval)timeDelay {
   if ((self = [super init])) {
     self.audioPlayer = player;
     [player prepareToPlay];
@@ -125,10 +124,6 @@
   if ([self.audioPlayer isPlaying] && _stopAfterFade) [self.audioPlayer stop];
 }
 
-- (void)dealloc {
-  releaseAndNil(_audioPlayer);
-  [super dealloc];
-}
 
 @end