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

MediaPlayerAPI: remove extension pattern check #153

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

MediaPlayerAPI: remove extension pattern check #153

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cf7110
MediaPlayerAPI: remove extension pattern check
tomty89 Apr 4, 2018
f1062d4
MediaPlayerAPI: prevent NullPointerException
tomty89 Apr 4, 2018
5cb2297
MediaPlayerAPI: eliminate pointless toUpperCase()
tomty89 Apr 4, 2018
5776b15
MediaPlayerAPI: check whether playback has been successfully started
tomty89 Apr 4, 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
46 changes: 17 additions & 29 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 @@ -14,7 +14,6 @@
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.regex.Pattern;

/**
* API that enables playback of standard audio formats such as:
Expand Down Expand Up @@ -126,16 +125,16 @@ public void onPrepared(MediaPlayer mediaPlayer) {
}

protected static MediaCommandHandler getMediaCommandHandler(final String command) {
switch (command.toUpperCase()) {
case "INFO":
switch (command == null ? "" : command) {
case "info":
return infoHandler;
case "PLAY":
case "play":
return playHandler;
case "PAUSE":
case "pause":
return pauseHandler;
case "RESUME":
case "resume":
return resumeHandler;
case "STOP":
case "stop":
return stopHandler;
default:
return new MediaCommandHandler() {
Expand Down Expand Up @@ -171,17 +170,6 @@ public void writeResult(PrintWriter out) throws Exception {
});
}

/**
* Checks to see if the specified file exists and is a supported media type
* @param file
* @return
*/
protected static boolean isValidMediaFile(File file) {
final String MEDIA_PATTERN = ".3gp|.flac|.mkv|.mp3|.ogg|.wav$";
Pattern pattern = Pattern.compile(MEDIA_PATTERN);
return pattern.matcher(file.getName()).find();
}

/**
* -----
* Media Command Handlers
Expand Down Expand Up @@ -210,20 +198,20 @@ public MediaCommandResult handle(MediaPlayer player, Context context, Intent int

File mediaFile = new File(intent.getStringExtra("file"));

if (!isValidMediaFile(mediaFile)) {
result.error = "Invalid file: " + mediaFile.getName();
} else {
if (player.isPlaying()) {
player.stop();
player.reset();
}
try {
player.setDataSource(context, Uri.fromFile(mediaFile));
player.prepareAsync();
if (player.isPlaying()) {
player.stop();
player.reset();
}
try {
player.setDataSource(context, Uri.fromFile(mediaFile));
player.prepareAsync();
result.message = "Now Playing: " + mediaFile.getName();
} catch (IOException e) {
result.error = e.getMessage();
} else {
result.error = "Failed to play: " + mediaFile.getName();
}
} catch (IOException e) {
result.error = e.getMessage();
}
return result;
}
Expand Down