You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by GitBox <gi...@apache.org> on 2018/08/18 16:26:21 UTC
[GitHub] janpio closed pull request #92: Cb 11085
janpio closed pull request #92: Cb 11085
URL: https://github.com/apache/cordova-plugin-media/pull/92
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/android/AudioHandler.java b/src/android/AudioHandler.java
index 2ff601dc..ee53e465 100644
--- a/src/android/AudioHandler.java
+++ b/src/android/AudioHandler.java
@@ -26,6 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one
import android.content.Context;
import android.content.pm.PackageManager;
import android.media.AudioManager;
+import android.media.AudioManager.OnAudioFocusChangeListener;
import android.net.Uri;
import android.os.Build;
import android.util.Log;
@@ -53,9 +54,9 @@ Licensed to the Apache Software Foundation (ASF) under one
*/
public class AudioHandler extends CordovaPlugin {
- public static String TAG = "AudioHandler";
- HashMap<String, AudioPlayer> players; // Audio player object
- ArrayList<AudioPlayer> pausedForPhone; // Audio players that were paused when phone call came in
+ HashMap<String, AudioPlayer> players; // Audio player object
+ ArrayList<AudioPlayer> pausedForPhone; // Audio players that were paused when phone call came in
+ ArrayList<AudioPlayer> pausedForFocus; // Audio players that were paused when focus was lost
private int origVolumeStream = -1;
private CallbackContext messageChannel;
@@ -68,6 +69,7 @@ Licensed to the Apache Software Foundation (ASF) under one
private String recordId;
private String fileUriStr;
+ private static final String LOG_TAG = "AudioHandler";
/**
* Constructor.
@@ -75,6 +77,7 @@ Licensed to the Apache Software Foundation (ASF) under one
public AudioHandler() {
this.players = new HashMap<String, AudioPlayer>();
this.pausedForPhone = new ArrayList<AudioPlayer>();
+ this.pausedForFocus = new ArrayList<AudioPlayer>();
}
@@ -292,6 +295,7 @@ public void stopRecordingAudio(String id) {
public void startPlayingAudio(String id, String file) {
AudioPlayer audio = getOrCreatePlayer(id, file);
audio.startPlaying(file);
+ getAudioFocus();
}
/**
@@ -367,10 +371,59 @@ else if (output == 1) {
audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL);
}
else {
- System.out.println("AudioHandler.setAudioOutputDevice() Error: Unknown output device.");
+ Log.e(LOG_TAG, "setAudioOutputDevice() Error: Unknown output device.");
}
}
+ public void pauseAllLostFocus() {
+ for (AudioPlayer audio : this.players.values()) {
+ if (audio.getState() == AudioPlayer.STATE.MEDIA_RUNNING.ordinal()) {
+ this.pausedForFocus.add(audio);
+ audio.pausePlaying();
+ }
+ }
+ }
+
+ public void resumeAllGainedFocus() {
+ for (AudioPlayer audio : this.pausedForFocus) {
+ audio.startPlaying(null);
+ }
+ this.pausedForFocus.clear();
+ }
+
+ /**
+ * Get the the audio focus
+ */
+ private OnAudioFocusChangeListener focusChangeListener = new OnAudioFocusChangeListener() {
+ public void onAudioFocusChange(int focusChange) {
+ switch (focusChange) {
+ case (AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK) :
+ case (AudioManager.AUDIOFOCUS_LOSS_TRANSIENT) :
+ case (AudioManager.AUDIOFOCUS_LOSS) :
+ pauseAllLostFocus();
+ break;
+ case (AudioManager.AUDIOFOCUS_GAIN):
+ resumeAllGainedFocus();
+ break;
+ default:
+ break;
+ }
+ }
+ };
+
+ public void getAudioFocus() {
+ AudioManager am = (AudioManager) this.cordova.getActivity().getSystemService(Context.AUDIO_SERVICE);
+ int result = am.requestAudioFocus(focusChangeListener,
+ AudioManager.STREAM_MUSIC,
+ AudioManager.AUDIOFOCUS_GAIN);
+
+ if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+ Log.e(LOG_TAG, "getAudioFocus() Error: Got " + result + " instead of " + AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+ }
+
+ }
+
+
/**
* Get the audio device to be used for playback.
*
@@ -399,9 +452,10 @@ else if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_SPEA
public void setVolume(String id, float volume) {
AudioPlayer audio = this.players.get(id);
if (audio != null) {
+ Log.d(LOG_TAG, "setVolume() Player:" + id + " Volume:" + String.format("%f",0.0f));
audio.setVolume(volume);
} else {
- System.out.println("AudioHandler.setVolume() Error: Unknown Audio Player " + id);
+ Log.e(LOG_TAG, "setVolume() Error: Unknown Audio Player:" + id );
}
}
@@ -425,7 +479,7 @@ void sendEventMessage(String action, JSONObject actionData) {
message.put(action, actionData);
}
} catch (JSONException e) {
- Log.e(TAG, "Failed to create event message", e);
+ Log.e(LOG_TAG, "Failed to create event message", e);
}
PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, message);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org