norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Add isEmpty() call to Song

Browse Source
This commit is contained in:
Adrian Ulrich 2015-10-07 09:40:58 +02:00
parent e4855e51eb
commit 052365c872
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ch/blinkenlights/android/vanilla/MediaUtils.java
View File

@ -423,7 +423,7 @@ public class MediaUtils {
} }
cursor.close(); cursor.close();
} }
return song.id == -1 ? null : song; return song.isEmpty() ? null : song;
} }
/** /**

2
src/ch/blinkenlights/android/vanilla/PlaybackService.java
View File

@ -1279,7 +1279,7 @@ public final class PlaybackService extends Service
else else
song = mTimeline.shiftCurrentSong(delta); song = mTimeline.shiftCurrentSong(delta);
mCurrentSong = song; mCurrentSong = song;
if (song == null || song.id == -1 || song.path == null) { if (song == null || song.isEmpty()) {
if (MediaUtils.isSongAvailable(getContentResolver())) { if (MediaUtils.isSongAvailable(getContentResolver())) {
int flag = finishAction(mState) == SongTimeline.FINISH_RANDOM ? FLAG_ERROR : FLAG_EMPTY_QUEUE; int flag = finishAction(mState) == SongTimeline.FINISH_RANDOM ? FLAG_ERROR : FLAG_EMPTY_QUEUE;
synchronized (mStateLock) { synchronized (mStateLock) {

2
src/ch/blinkenlights/android/vanilla/RemoteControl.java
View File

@ -87,7 +87,7 @@ public class RemoteControl {
remote.setPlaybackState(isPlaying ? RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED); remote.setPlaybackState(isPlaying ? RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED);
RemoteControlClient.MetadataEditor editor = remote.editMetadata(true); 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_ARTIST, song.artist);
editor.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, song.album); editor.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, song.album);
editor.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, song.title); editor.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, song.title);