Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Android - playback, position, seek methods executed in background thread #368

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Android - playback, position, seek methods executed in background thread #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 113 additions & 36 deletions src/android/AudioHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,38 +130,86 @@ else if (action.equals("resumeRecordingAudio")) {
this.resumeRecordingAudio(args.getString(0));
}
else if (action.equals("startPlayingAudio")) {
String id = args.getString(0);
String target = args.getString(1);
String fileUriStr;
try {
Uri targetUri = resourceApi.remapUri(Uri.parse(target));
fileUriStr = targetUri.toString();
} catch (IllegalArgumentException e) {
fileUriStr = target;
}
this.startPlayingAudio(args.getString(0), FileHelper.stripFileProtocol(fileUriStr));

cordova.getThreadPool().execute(new Runnable() {
public void run() {
String fileUriStr;
try {
Uri targetUri = resourceApi.remapUri(Uri.parse(target));
fileUriStr = targetUri.toString();
} catch (IllegalArgumentException e) {
fileUriStr = target;
}

startPlayingAudio(id, FileHelper.stripFileProtocol(fileUriStr));
}
});
}
else if (action.equals("seekToAudio")) {
this.seekToAudio(args.getString(0), args.getInt(1));
String id = args.getString(0);
int positionMs = args.getInt(1);

cordova.getThreadPool().execute(new Runnable() {
public void run() {
seekToAudio(id, positionMs);
}
});
}
else if (action.equals("pausePlayingAudio")) {
this.pausePlayingAudio(args.getString(0));
String id = args.getString(0);

cordova.getThreadPool().execute(new Runnable() {
public void run() {
pausePlayingAudio(id);
}
});
}
else if (action.equals("stopPlayingAudio")) {
this.stopPlayingAudio(args.getString(0));
String id = args.getString(0);

cordova.getThreadPool().execute(new Runnable() {
public void run() {
stopPlayingAudio(id);
}
});
} else if (action.equals("setVolume")) {
try {
this.setVolume(args.getString(0), Float.parseFloat(args.getString(1)));
} catch (NumberFormatException nfe) {
//no-op
}
String id = args.getString(0);
String volume = args.getString(1);

cordova.getThreadPool().execute(new Runnable() {
public void run() {
try {
setVolume(id, Float.parseFloat(volume));
} catch (NumberFormatException nfe) {
//no-op
}
}
});
} else if (action.equals("getCurrentPositionAudio")) {
float f = this.getCurrentPositionAudio(args.getString(0));
callbackContext.sendPluginResult(new PluginResult(status, f));
String id = args.getString(0);

cordova.getThreadPool().execute(new Runnable() {
public void run() {
float f = getCurrentPositionAudio(id);
callbackContext.sendPluginResult(new PluginResult(status, f));
}
});

return true;
}
else if (action.equals("getDurationAudio")) {
float f = this.getDurationAudio(args.getString(0), args.getString(1));
callbackContext.sendPluginResult(new PluginResult(status, f));
String id = args.getString(0);
String file = args.getString(1);

cordova.getThreadPool().execute(new Runnable() {
public void run() {
float f = getDurationAudio(id, file);
callbackContext.sendPluginResult(new PluginResult(status, f));
}
});

return true;
}
else if (action.equals("create")) {
Expand All @@ -170,20 +218,42 @@ else if (action.equals("create")) {
getOrCreatePlayer(id, src);
}
else if (action.equals("release")) {
boolean b = this.release(args.getString(0));
callbackContext.sendPluginResult(new PluginResult(status, b));
String id = args.getString(0);

cordova.getThreadPool().execute(new Runnable() {
public void run() {
boolean b = release(id);
callbackContext.sendPluginResult(new PluginResult(status, b));
}
});

return true;
}
else if (action.equals("messageChannel")) {
messageChannel = callbackContext;
return true;
} else if (action.equals("getCurrentAmplitudeAudio")) {
float f = this.getCurrentAmplitudeAudio(args.getString(0));
callbackContext.sendPluginResult(new PluginResult(status, f));
String id = args.getString(0);

cordova.getThreadPool().execute(new Runnable() {
public void run() {
float f = getCurrentAmplitudeAudio(id);
callbackContext.sendPluginResult(new PluginResult(status, f));
}
});

return true;
}
else if (action.equals("setRate")) {
this.setRate(args.getString(0), Float.parseFloat(args.getString(1)));
String id = args.getString(0);
String rate = args.getString(1);

cordova.getThreadPool().execute(new Runnable() {
public void run() {
setRate(id, Float.parseFloat(rate));
}
});

return true;
}
else { // Unrecognized action.
Expand Down Expand Up @@ -403,7 +473,7 @@ else if (output == 1) {
audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL);
}
else {
LOG.e(TAG1," Unknown output device");
LOG.e(TAG1," Unknown output device");
}
}

Expand All @@ -427,8 +497,8 @@ public void resumeAllGainedFocus() {
* Get the the audio focus
*/
private OnAudioFocusChangeListener focusChangeListener = new OnAudioFocusChangeListener() {
public void onAudioFocusChange(int focusChange) {
switch (focusChange) {
public void onAudioFocusChange(int focusChange) {
switch (focusChange) {
case (AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK) :
case (AudioManager.AUDIOFOCUS_LOSS_TRANSIENT) :
case (AudioManager.AUDIOFOCUS_LOSS) :
Expand All @@ -439,17 +509,17 @@ public void onAudioFocusChange(int focusChange) {
break;
default:
break;
}
}
};
}
};

public void getAudioFocus() {
String TAG2 = "AudioHandler.getAudioFocus(): Error : ";

AudioManager am = (AudioManager) this.cordova.getActivity().getSystemService(Context.AUDIO_SERVICE);
int result = am.requestAudioFocus(focusChangeListener,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);

if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
LOG.e(TAG2,result + " instead of " + AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
Expand Down Expand Up @@ -490,13 +560,13 @@ public void setVolume(String id, float volume) {
if (audio != null) {
audio.setVolume(volume);
} else {
LOG.e(TAG3,"Unknown Audio Player " + id);
LOG.e(TAG3,"Unknown Audio Player " + id);
}
}

/**
* Set the playback rate of an audio file
*
*
* @param id The id of the audio player
* @param rate The playback rate
*/
Expand All @@ -509,7 +579,7 @@ public void setRate(String id, float rate) {
LOG.e(TAG3, "Unknown Audio Player " + id);
}
}


private void onFirstPlayerCreated() {
origVolumeStream = cordova.getActivity().getVolumeControlStream();
Expand Down Expand Up @@ -589,4 +659,11 @@ public float getCurrentAmplitudeAudio(String id) {
}
return 0;
}
}

/**
* Obtains cordova threadPool
*/
public java.util.concurrent.ExecutorService getThreadPool() {
return cordova.getThreadPool();
}
}
Loading