aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-10-06 17:33:31 -0700
committerScott Jackson <daneren2005@gmail.com>2015-10-06 17:33:31 -0700
commit1981f399e9123bed8814ffb2391393df1b07876f (patch)
treeb416675b616cfc8d0f138296a17572f0a88839af /app
parente30ce23fed3b11c275ee95d2a156fd951cd2d728 (diff)
downloaddsub-1981f399e9123bed8814ffb2391393df1b07876f.tar.gz
dsub-1981f399e9123bed8814ffb2391393df1b07876f.tar.bz2
dsub-1981f399e9123bed8814ffb2391393df1b07876f.zip
Accidentally included in merge commit
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java24
1 files changed, 11 insertions, 13 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java b/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
index 6006e280..77b0395b 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
@@ -319,22 +319,20 @@ public class ChromeCastController extends RemoteController {
meta.putString(MediaMetadata.KEY_ALBUM_ARTIST, song.getArtist());
meta.putString(MediaMetadata.KEY_ALBUM_TITLE, song.getAlbum());
- if(castDevice.hasCapability(CastDevice.CAPABILITY_VIDEO_IN)) {
- if (proxy == null || proxy instanceof WebProxy) {
- String coverArt = musicService.getCoverArtUrl(downloadService, song);
+ if (proxy == null || proxy instanceof WebProxy) {
+ String coverArt = musicService.getCoverArtUrl(downloadService, song);
- // If proxy is going, it is a web proxy
- if (proxy != null) {
- coverArt = proxy.getPublicAddress(coverArt);
- }
+ // If proxy is going, it is a web proxy
+ if (proxy != null) {
+ coverArt = proxy.getPublicAddress(coverArt);
+ }
+ meta.addImage(new WebImage(Uri.parse(coverArt)));
+ } else {
+ File coverArtFile = FileUtil.getAlbumArtFile(downloadService, song);
+ if (coverArtFile != null && coverArtFile.exists()) {
+ String coverArt = proxy.getPublicAddress(coverArtFile.getPath());
meta.addImage(new WebImage(Uri.parse(coverArt)));
- } else {
- File coverArtFile = FileUtil.getAlbumArtFile(downloadService, song);
- if (coverArtFile != null && coverArtFile.exists()) {
- String coverArt = proxy.getPublicAddress(coverArtFile.getPath());
- meta.addImage(new WebImage(Uri.parse(coverArt)));
- }
}
}
}