Merge branch 'master' into beta

amahi · Oct 16, 2017 · 03523b0 · 03523b0
2 parents 4e515c8 + 8b8764d
commit 03523b0
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 6 deletions.
diff --git a/cast/README.md b/cast/README.md
@@ -0,0 +1 @@
+# Chromecast styled receiver support files
diff --git a/cast/amahi_app_icon.png b/cast/amahi_app_icon.png
diff --git a/cast/amahi_cast_logo.png b/cast/amahi_cast_logo.png
diff --git a/cast/amahi_cast_splash.png b/cast/amahi_cast_splash.png
diff --git a/cast/amahi_cast_watermark.png b/cast/amahi_cast_watermark.png
diff --git a/cast/style.css b/cast/style.css
@@ -0,0 +1,20 @@
+.logo {
+  background-image: url(amahi_cast_logo.png);
+  background-size: auto 10%;
+  background-color: white;
+}
+
+.splash {
+  background-image: url(amahi_cast_splash.png);
+  box-shadow: inset 0 0 0.1em 0.1em #000;
+  background-color: white;
+}
+
+.watermark {
+  background-image: url(amahi_cast_watermark.png);
+  background-size: auto 57px;
+}
+
+.placeholderImage {
+  background-size: contain;
+}
diff --git a/src/main/java/org/amahi/anywhere/service/AudioService.java b/src/main/java/org/amahi/anywhere/service/AudioService.java
@@ -228,14 +228,16 @@ private void setUpAudioMetadata() {
 
 	@Subscribe
 	public void onAudioMetadataRetrieved(AudioMetadataRetrievedEvent event) {
-		this.audioMetadataFormatter = new AudioMetadataFormatter(
-			event.getAudioTitle(), event.getAudioArtist(), event.getAudioAlbum());
-		this.audioMetadataFormatter.setDuration(event.getDuration());
-		this.audioAlbumArt = event.getAudioAlbumArt();
+		if (audioFile != null) {
+			this.audioMetadataFormatter = new AudioMetadataFormatter(
+					event.getAudioTitle(), event.getAudioArtist(), event.getAudioAlbum());
+			this.audioMetadataFormatter.setDuration(event.getDuration());
+			this.audioAlbumArt = event.getAudioAlbumArt();
 
-		setUpAudioPlayerRemote(audioMetadataFormatter, audioAlbumArt);
+			setUpAudioPlayerRemote(audioMetadataFormatter, audioAlbumArt);
 
-		mMediaNotificationManager.startNotification();
+			mMediaNotificationManager.startNotification();
+		}
 	}
 
 	private void setUpAudioPlayerRemote(AudioMetadataFormatter audioMetadataFormatter, Bitmap audioAlbumArt) {