From 753410bbefb79e2f49b0de00ffa1ab4459e9707c Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Sun, 2 Jul 2017 14:26:23 +0200 Subject: [PATCH] rename getQueuePositionForSong into getQueuePositionForSongId() --- src/ch/blinkenlights/android/vanilla/LibraryActivity.java | 2 +- src/ch/blinkenlights/android/vanilla/PlaybackService.java | 4 ++-- src/ch/blinkenlights/android/vanilla/SongTimeline.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java index 3f1b7081..93069f2f 100644 --- a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java +++ b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java @@ -376,7 +376,7 @@ public class LibraryActivity // special handling if we pick one song to be played that is already in queue boolean songPicked = (id >= 0 && type == MediaUtils.TYPE_SONG); // not invalid, not play all if (songPicked && effectiveAction == ACTION_PLAY) { - int songPosInQueue = PlaybackService.get(this).getQueuePositionForSong(id); + int songPosInQueue = PlaybackService.get(this).getQueuePositionForSongId(id); if (songPosInQueue > -1) { // we picked for play one song that is already present in the queue, just jump to it PlaybackService.get(this).jumpToQueuePosition(songPosInQueue); diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java index d83a7df4..bd2f6b83 100644 --- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java +++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java @@ -2324,8 +2324,8 @@ public final class PlaybackService extends Service * @param id song id as defined in {@link Song#id} * @return absolute position in song timeline or -1 if song currently not in timeline */ - public int getQueuePositionForSong(long id) { - return mTimeline.getQueuePositionForSong(id); + public int getQueuePositionForSongId(long id) { + return mTimeline.getQueuePositionForSongId(id); } /** diff --git a/src/ch/blinkenlights/android/vanilla/SongTimeline.java b/src/ch/blinkenlights/android/vanilla/SongTimeline.java index 7131b859..70a46f5b 100644 --- a/src/ch/blinkenlights/android/vanilla/SongTimeline.java +++ b/src/ch/blinkenlights/android/vanilla/SongTimeline.java @@ -658,9 +658,9 @@ public final class SongTimeline { } /** - * Returns song position for given {@link Song} + * Returns song position for given {@link Song.id} */ - public int getQueuePositionForSong(long id) { + public int getQueuePositionForSongId(long id) { synchronized (this) { for (int pos = 0; pos < mSongs.size(); pos++) { Song current = mSongs.get(pos);