aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-07-10 20:17:16 -0700
committerScott Jackson <daneren2005@gmail.com>2013-07-10 20:17:16 -0700
commitf605a1868dc9d81b96bb613d5f60e9d86831516f (patch)
tree9408954cc5f9d19a3a0f9445a39a2ce836497887
parentf8baa8956a2bebcf3e536124cd3d38ee79f563be (diff)
downloaddsub-f605a1868dc9d81b96bb613d5f60e9d86831516f.tar.gz
dsub-f605a1868dc9d81b96bb613d5f60e9d86831516f.tar.bz2
dsub-f605a1868dc9d81b96bb613d5f60e9d86831516f.zip
Fix podcasts which contain videos
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java12
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/service/parser/PodcastEntryParser.java1
2 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 bc823be6..e8bac798 100644
--- a/subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -145,7 +145,7 @@ public class SubsonicFragment extends SherlockFragment {
if(selected instanceof MusicDirectory.Entry) {
MusicDirectory.Entry entry = (MusicDirectory.Entry) selected;
- if(entry instanceof PodcastEpisode) {
+ if(entry instanceof PodcastEpisode && !entry.isVideo()) {
if(Util.isOffline(context)) {
inflater.inflate(R.menu.select_podcast_episode_context_offline, menu);
}
@@ -836,12 +836,10 @@ public class SubsonicFragment extends SherlockFragment {
}
String msg = "";
- if(!song.isVideo()) {
- if(song instanceof PodcastEpisode) {
- msg += "Podcast: " + song.getArtist() + "\nStatus: " + ((PodcastEpisode)song).getStatus();
- } else {
- msg += "Artist: " + song.getArtist() + "\nAlbum: " + song.getAlbum();
- }
+ if(song instanceof PodcastEpisode) {
+ msg += "Podcast: " + song.getArtist() + "\nStatus: " + ((PodcastEpisode)song).getStatus();
+ } else if(!song.isVideo()) {
+ msg += "Artist: " + song.getArtist() + "\nAlbum: " + song.getAlbum();
}
if(song.getTrack() != null && song.getTrack() != 0) {
msg += "\nTrack: " + song.getTrack();
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/parser/PodcastEntryParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/PodcastEntryParser.java
index 408b1b7a..b9e4d98a 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/parser/PodcastEntryParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/PodcastEntryParser.java
@@ -74,6 +74,7 @@ public class PodcastEntryParser extends AbstractParser {
episode.setSuffix(get("suffix"));
episode.setDuration(getInteger("duration"));
episode.setBitRate(getInteger("bitRate"));
+ episode.setVideo(getBoolean("isVideo"));
episode.setPath(get("path"));
if(episode.getPath() == null) {
episode.setPath(FileUtil.getPodcastPath(context, episode));