From 90c611ac3aa60d8a6773598feba56f30ec1b8657 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Tue, 11 Jun 2013 16:41:02 -0700 Subject: Fix stream video menu not obeying flash option --- .../github/daneren2005/dsub/fragments/SubsonicFragment.java | 13 ++++++------- 1 file 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 { -- cgit v1.2.3