这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix incorrect error message display / crash when playing subsequent track #157

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

Merged
merged 1 commit into from
Apr 8, 2018
Merged

Fix incorrect error message display / crash when playing subsequent track #157

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
15 changes: 6 additions & 9 deletions app/src/main/java/com/termux/api/MediaPlayerAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ static void onReceive(final Context context, final Intent intent) {
/**
* All media functionality exists in this background service
*/
public static class PlayerService extends Service implements MediaPlayer.OnPreparedListener,
MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener {
public static class PlayerService extends Service implements MediaPlayer.OnErrorListener,
MediaPlayer.OnCompletionListener {

protected static MediaPlayer mediaPlayer;

Expand All @@ -56,7 +56,6 @@ public static class PlayerService extends Service implements MediaPlayer.OnPrepa
protected MediaPlayer getMediaPlayer() {
if (mediaPlayer == null) {
mediaPlayer = new MediaPlayer();
mediaPlayer.setOnPreparedListener(this);
mediaPlayer.setOnCompletionListener(this);
mediaPlayer.setOnErrorListener(this);
mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);
Expand Down Expand Up @@ -116,12 +115,7 @@ public boolean onError(MediaPlayer mediaPlayer, int what, int extra) {
@Override
public void onCompletion(MediaPlayer mediaPlayer) {
hasTrack = false;
}

@Override
public void onPrepared(MediaPlayer mediaPlayer) {
hasTrack = true;
mediaPlayer.start();
mediaPlayer.reset();
}

protected static MediaCommandHandler getMediaCommandHandler(final String command) {
Expand Down Expand Up @@ -205,6 +199,9 @@ public MediaCommandResult handle(MediaPlayer player, Context context, Intent int
try {
player.setDataSource(context, Uri.fromFile(mediaFile));
player.prepare();
player.start();
hasTrack = true;

if (player.isPlaying()) {
result.message = "Now Playing: " + mediaFile.getName();
} else {
Expand Down