Merge pull request zmxv#3 from cark1/handle_duck_and_mix

cark1 · web-flow · commit 2a46d4f42d66 · 2023-05-04T09:49:31.000+02:00
Handle duck and mix
diff --git a/RNSound/RNSound.m b/RNSound/RNSound.m
@@ -147,8 +147,8 @@ - (NSDictionary *)constantsToExport {
 }
 
 RCT_EXPORT_METHOD(setCategory
-                  : (NSString *)categoryName mixWithOthers
-                  : (BOOL)mixWithOthers) {
+                  : (NSString *)categoryName duckAudio
+                  : (BOOL)duckAudio) {
     AVAudioSession *session = [AVAudioSession sharedInstance];
     NSString *category = nil;
 
@@ -173,13 +173,15 @@ - (NSDictionary *)constantsToExport {
     }
 
     if (category) {
-        if (mixWithOthers) {
+        if (duckAudio) {
             [session setCategory:category
                      withOptions:AVAudioSessionCategoryOptionDuckOthers 
                      //| AVAudioSessionCategoryOptionAllowBluetooth
                            error:nil];
         } else {
-            [session setCategory:category error:nil];
+            [session setCategory:category 
+                      withOptions:AVAudioSessionCategoryOptionMixWithOthers
+                            error:nil];
         }
     }
 }
diff --git a/android/src/main/java/com/zmxv/RNSound/RNSoundModule.java b/android/src/main/java/com/zmxv/RNSound/RNSoundModule.java
@@ -31,7 +31,7 @@ public class RNSoundModule extends ReactContextBaseJavaModule implements AudioMa
   ReactApplicationContext context;
   final static Object NULL = null;
   String category;
-  Boolean mixWithOthers = true;
+  Boolean duckAudio = true;
   Double focusedPlayerKey;
   Boolean wasPlayingBeforeFocusChange = false;
 
@@ -236,10 +236,10 @@ public void play(final Double key, final Callback callback) {
     }
 
     // Request audio focus in Android system
-    if (!this.mixWithOthers) {
+    if (!this.duckAudio) {
       AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
 
-      audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
+      audioManager.abandonAudioFocus(this);
 
       this.focusedPlayerKey = key;
     }else {
@@ -308,7 +308,7 @@ public void stop(final Double key, final Callback callback) {
     }
 
     // Release audio focus in Android system
-    if (!this.mixWithOthers && key == this.focusedPlayerKey) {
+    if (!this.duckAudio && key == this.focusedPlayerKey) {
       AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
       audioManager.abandonAudioFocus(this);
     }
@@ -333,7 +333,7 @@ public void release(final Double key) {
       this.playerPool.remove(key);
 
       // Release audio focus in Android system
-      if (!this.mixWithOthers && key == this.focusedPlayerKey) {
+      if (!this.duckAudio && key == this.focusedPlayerKey) {
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         audioManager.abandonAudioFocus(this);
       }
@@ -452,11 +452,11 @@ public void setSpeakerphoneOn(final Double key, final Boolean speaker) {
   }
 
   @ReactMethod
-  public void setCategory(final String category, final Boolean mixWithOthers) {
+  public void setCategory(final String category, final Boolean duckAudio) {
     this.category = category;
-    this.mixWithOthers = mixWithOthers;
+    this.duckAudio = duckAudio;
 	  
-    if(!this.mixWithOthers){
+    if(!this.duckAudio){
     	AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
       audioManager.abandonAudioFocus(this);
     }
@@ -465,7 +465,7 @@ public void setCategory(final String category, final Boolean mixWithOthers) {
 
   @Override
   public void onAudioFocusChange(int focusChange) {
-    if (!this.mixWithOthers) {
+    if (!this.duckAudio) {
       MediaPlayer player = this.playerPool.get(this.focusedPlayerKey);
 
       if (player != null) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-sound",
-  "version": "0.11.5",
+  "version": "0.11.6",
   "description": "React Native module for playing sound clips on iOS, Android, and Windows",
   "main": "sound.js",
   "typings": "index.d.ts",
diff --git a/sound.js b/sound.js
@@ -307,9 +307,9 @@ Sound.setActive = function(value) {
   }
 };
 
-Sound.setCategory = function(value, mixWithOthers = false) {
+Sound.setCategory = function(value, duckAudio = false) {
   if (!IsWindows) {
-    RNSound.setCategory(value, mixWithOthers);
+    RNSound.setCategory(value, duckAudio);
   }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,8 @@ - (NSDictionary *)constantsToExport {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`RCT_EXPORT_METHOD(setCategory`
`150`		`- : (NSString *)categoryName mixWithOthers`
`151`		`- : (BOOL)mixWithOthers) {`
	`150`	`+ : (NSString *)categoryName duckAudio`
	`151`	`+ : (BOOL)duckAudio) {`
`152`	`152`	`AVAudioSession *session = [AVAudioSession sharedInstance];`
`153`	`153`	`NSString *category = nil;`
`154`	`154`
`@@ -173,13 +173,15 @@ - (NSDictionary *)constantsToExport {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`if (category) {`
`176`		`- if (mixWithOthers) {`
	`176`	`+ if (duckAudio) {`
`177`	`177`	`[session setCategory:category`
`178`	`178`	`withOptions:AVAudioSessionCategoryOptionDuckOthers`
`179`	`179`	`//\| AVAudioSessionCategoryOptionAllowBluetooth`
`180`	`180`	`error:nil];`
`181`	`181`	`} else {`
`182`		`- [session setCategory:category error:nil];`
	`182`	`+ [session setCategory:category`
	`183`	`+ withOptions:AVAudioSessionCategoryOptionMixWithOthers`
	`184`	`+ error:nil];`
`183`	`185`	`}`
`184`	`186`	`}`
`185`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-native-sound",`
`3`		`- "version": "0.11.5",`
	`3`	`+ "version": "0.11.6",`
`4`	`4`	`"description": "React Native module for playing sound clips on iOS, Android, and Windows",`
`5`	`5`	`"main": "sound.js",`
`6`	`6`	`"typings": "index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -307,9 +307,9 @@ Sound.setActive = function(value) {`
`307`	`307`	`}`
`308`	`308`	`};`
`309`	`309`
`310`		`-Sound.setCategory = function(value, mixWithOthers = false) {`
	`310`	`+Sound.setCategory = function(value, duckAudio = false) {`
`311`	`311`	`if (!IsWindows) {`
`312`		`- RNSound.setCategory(value, mixWithOthers);`
	`312`	`+ RNSound.setCategory(value, duckAudio);`
`313`	`313`	`}`
`314`	`314`	`};`
`315`	`315`