fix(ios): volume event handling (#11227)

tidev · Sep 20, 2019 · 6d4e417 · 6d4e417
1 parent df39a91
commit 6d4e417
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/iphone/Classes/MediaModule.m b/iphone/Classes/MediaModule.m
@@ -441,7 +441,6 @@ - (void)setAudioSessionMode:(NSNumber *)mode
   }
 }
 
-#if defined(USE_TI_MEDIAAUDIOPLAYER) || defined(USE_TI_MEDIAMUSICPLAYER) || defined(USE_TI_MEDIASOUND) || defined(USE_TI_MEDIAVIDEOPLAYER) || defined(USE_TI_MEDIAAUDIORECORDER)
 - (void)setAudioSessionCategory:(NSString *)mode
 {
   [[TiMediaAudioSession sharedSession] setSessionMode:mode];
@@ -526,7 +525,6 @@ - (void)audioVolumeChanged:(NSNotification *)note
     [self fireEvent:@"volume" withObject:event];
   }
 }
-#endif
 
 #if defined(USE_TI_MEDIAAVAILABLECAMERAMEDIATYPES) || defined(USE_TI_MEDIAISMEDIATYPESUPPORTED)
 - (NSArray *)availableCameraMediaTypes

diff --git a/iphone/Classes/TiMediaAudioSession.h b/iphone/Classes/TiMediaAudioSession.h
@@ -4,7 +4,7 @@
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
  */
-#if defined(USE_TI_MEDIA) && (defined(USE_TI_MEDIAAUDIOPLAYER) || defined(USE_TI_MEDIAVIDEOPLAYER) || defined(USE_TI_MEDIASOUND) || defined(USE_TI_MEDIAAUDIORECORDER))
+#if defined(USE_TI_MEDIA) || (defined(USE_TI_MEDIAAUDIOPLAYER) || defined(USE_TI_MEDIAVIDEOPLAYER) || defined(USE_TI_MEDIASOUND) || defined(USE_TI_MEDIAAUDIORECORDER))
 
 extern NSString *const kTiMediaAudioSessionInterruptionBegin;
 extern NSString *const kTiMediaAudioSessionInterruptionEnd;

diff --git a/iphone/Classes/TiMediaAudioSession.m b/iphone/Classes/TiMediaAudioSession.m
@@ -4,7 +4,7 @@
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
  */
-#if defined(USE_TI_MEDIA) && (defined(USE_TI_MEDIAAUDIOPLAYER) || defined(USE_TI_MEDIAVIDEOPLAYER) || defined(USE_TI_MEDIASOUND) || defined(USE_TI_MEDIAAUDIORECORDER))
+#if defined(USE_TI_MEDIA) || (defined(USE_TI_MEDIAAUDIOPLAYER) || defined(USE_TI_MEDIAVIDEOPLAYER) || defined(USE_TI_MEDIASOUND) || defined(USE_TI_MEDIAAUDIORECORDER))
 
 #import "TiMediaAudioSession.h"
 #import <TitaniumKit/TiUtils.h>