diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-06-11 16:41:02 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-06-11 16:41:02 -0700 |
| commit | 90c611ac3aa60d8a6773598feba56f30ec1b8657 (patch) | |
| tree | cb742cc8ee9b04c638768479b71cf3f95f04f516 /subsonic-android | |
| parent | 3659a8bd2f40e4ba906fa73bfa7d75c29dc5990b (diff) | |
| download | dsub-90c611ac3aa60d8a6773598feba56f30ec1b8657.tar.gz dsub-90c611ac3aa60d8a6773598feba56f30ec1b8657.tar.bz2 dsub-90c611ac3aa60d8a6773598feba56f30ec1b8657.zip | |
Fix stream video menu not obeying flash option
Diffstat (limited to 'subsonic-android')
| -rw-r--r-- | subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java index 77479424..f417290b 100644 --- a/subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java +++ b/subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java @@ -853,15 +853,10 @@ public class SubsonicFragment extends SherlockFragment { }
protected void playVideo(MusicDirectory.Entry entry) {
- String videoPlayerType = Util.getVideoPlayerType(context);
if(entryExists(entry)) {
playExternalPlayer(entry);
} else {
- if("flash".equals(videoPlayerType)) {
- playWebView(entry);
- } else {
- streamExternalPlayer(entry, "raw".equals(videoPlayerType) ? "raw" : entry.getTranscodedSuffix());
- }
+ streamExternalPlayer(entry);
}
}
@@ -891,7 +886,11 @@ public class SubsonicFragment extends SherlockFragment { }
protected void streamExternalPlayer(MusicDirectory.Entry entry) {
String videoPlayerType = Util.getVideoPlayerType(context);
- streamExternalPlayer(entry, "raw".equals(videoPlayerType) ? "raw" : entry.getTranscodedSuffix());
+ if("flash".equals(videoPlayerType)) {
+ playWebView(entry);
+ } else {
+ streamExternalPlayer(entry, "raw".equals(videoPlayerType) ? "raw" : entry.getTranscodedSuffix());
+ }
}
protected void streamExternalPlayer(MusicDirectory.Entry entry, String format) {
try {
|