From 052365c872c51c55281b58ed566888b6e3e0ee6b Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Wed, 7 Oct 2015 09:40:58 +0200
Subject: [PATCH] Add isEmpty() call to Song

---
 src/ch/blinkenlights/android/vanilla/MediaUtils.java      | 2 +-
 src/ch/blinkenlights/android/vanilla/PlaybackService.java | 2 +-
 src/ch/blinkenlights/android/vanilla/RemoteControl.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ch/blinkenlights/android/vanilla/MediaUtils.java b/src/ch/blinkenlights/android/vanilla/MediaUtils.java
index 0c6b51af..418269c0 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaUtils.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaUtils.java
@@ -423,7 +423,7 @@ public class MediaUtils {
 			}
 			cursor.close();
 		}
-		return song.id == -1 ? null : song;
+		return song.isEmpty() ? null : song;
 	}
 
 	/**
diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
index e6c1bfa8..1887b488 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
@@ -1279,7 +1279,7 @@ public final class PlaybackService extends Service
 		else
 			song = mTimeline.shiftCurrentSong(delta);
 		mCurrentSong = song;
-		if (song == null || song.id == -1 || song.path == null) {
+		if (song == null || song.isEmpty()) {
 			if (MediaUtils.isSongAvailable(getContentResolver())) {
 				int flag = finishAction(mState) == SongTimeline.FINISH_RANDOM ? FLAG_ERROR : FLAG_EMPTY_QUEUE;
 				synchronized (mStateLock) {
diff --git a/src/ch/blinkenlights/android/vanilla/RemoteControl.java b/src/ch/blinkenlights/android/vanilla/RemoteControl.java
index 1790fd90..ba16df8e 100644
--- a/src/ch/blinkenlights/android/vanilla/RemoteControl.java
+++ b/src/ch/blinkenlights/android/vanilla/RemoteControl.java
@@ -87,7 +87,7 @@ public class RemoteControl {
 
 		remote.setPlaybackState(isPlaying ? RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED);
 		RemoteControlClient.MetadataEditor editor = remote.editMetadata(true);
-		if (song != null && song.id != -1) {
+		if (song != null && song.isEmpty() == false) {
 			editor.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, song.artist);
 			editor.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, song.album);
 			editor.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, song.title);