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

MediaPlayerAPI: some more minor improvements #160

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 6 commits into from
Apr 11, 2018
Merged

MediaPlayerAPI: some more minor improvements #160

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f7d731
MediaPlayerAPI: revert commit 299d557
tomty89 Apr 9, 2018
a68a937
MediaPlayerAPI: catch NullPointerException for -a play
tomty89 Apr 9, 2018
2318716
MediaPlayerAPI: use getCanonicalPath() instead
tomty89 Apr 9, 2018
cc8f5d0
MediaPlayerAPI: use proper values for setVolume()
tomty89 Apr 9, 2018
068733b
MediaPlayerAPI: fix play and stop from pause
tomty89 Apr 9, 2018
e66d0da
MediaPlayerAPI: add trackName for info and resume
tomty89 Apr 9, 2018
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
39 changes: 23 additions & 16 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 @@ -4,7 +4,6 @@
import android.content.Context;
import android.content.Intent;
import android.media.MediaPlayer;
import android.net.Uri;
import android.os.IBinder;
import android.os.PowerManager;

Expand Down Expand Up @@ -69,6 +68,8 @@ public static class PlayerService extends Service implements MediaPlayer.OnError
// do we currently have a track to play?
protected static boolean hasTrack;

protected static String trackName;


/**
* Returns our MediaPlayer instance and ensures it has all the necessary callbacks
Expand All @@ -80,7 +81,7 @@ protected MediaPlayer getMediaPlayer() {
mediaPlayer.setOnCompletionListener(this);
mediaPlayer.setOnErrorListener(this);
mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);
mediaPlayer.setVolume(100, 100);
mediaPlayer.setVolume(1.0f, 1.0f);
}
return mediaPlayer;
}
Expand Down Expand Up @@ -198,7 +199,7 @@ public MediaCommandResult handle(MediaPlayer player, Context context, Intent int

if (hasTrack) {
String status = player.isPlaying() ? "Playing" : "Paused";
result.message = String.format("Status: %s\n%s", status, getPlaybackPositionString(player));
result.message = String.format("Status: %s\nTrack: %s\nCurrent Position: %s", status, trackName, getPlaybackPositionString(player));
} else {
result.message = "No track currently!";
}
Expand All @@ -211,26 +212,32 @@ public MediaCommandResult handle(MediaPlayer player, Context context, Intent int
public MediaCommandResult handle(MediaPlayer player, Context context, Intent intent) {
MediaCommandResult result = new MediaCommandResult();

File mediaFile = new File(intent.getStringExtra("file"));
File mediaFile = null;
try {
mediaFile = new File(intent.getStringExtra("file"));
} catch (NullPointerException e) {
result.error = "No file was specified";
return result;
}

if (player.isPlaying()) {
if (hasTrack) {
player.stop();
player.reset();
hasTrack = false;
}

try {
player.setDataSource(context, Uri.fromFile(mediaFile));
player.setDataSource(mediaFile.getCanonicalPath());
player.prepare();
player.start();
hasTrack = true;

if (player.isPlaying()) {
result.message = "Now Playing: " + mediaFile.getName();
} else {
result.error = "Failed to play: " + mediaFile.getName();
}
} catch (IOException e) {
result.error = e.getMessage();
return result;
}

player.start();
hasTrack = true;
trackName = mediaFile.getName();
result.message = "Now Playing: " + trackName;
return result;
}
};
Expand Down Expand Up @@ -270,7 +277,7 @@ protected static String getPlaybackPositionString(MediaPlayer player) {
public MediaCommandResult handle(MediaPlayer player, Context context, Intent intent) {
MediaCommandResult result = new MediaCommandResult();
if (hasTrack) {
String positionString = "Current Position: " + getPlaybackPositionString(player);
String positionString = String.format("Track: %s\nCurrent Position: %s", trackName, getPlaybackPositionString(player));

if (player.isPlaying()) {
result.message = "Already playing track!\n" + positionString;
Expand All @@ -290,7 +297,7 @@ public MediaCommandResult handle(MediaPlayer player, Context context, Intent int
public MediaCommandResult handle(MediaPlayer player, Context context, Intent intent) {
MediaCommandResult result = new MediaCommandResult();

if (player.isPlaying()) {
if (hasTrack) {
player.stop();
player.reset();
hasTrack = false;
Expand Down