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

Rename Song.populate to Song.query

Browse Source
This commit is contained in:
Christopher Eby 2010-05-18 19:14:16 -05:00
parent b878e1aebe
commit 1f2f9d5d86
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/kreed/vanilla/PlaybackService.java
View File

@ -560,7 +560,7 @@ public final class PlaybackService extends Service implements Handler.Callback,
Log.e("VanillaMusic", "MediaPlayer error: " + what + " " + extra); Log.e("VanillaMusic", "MediaPlayer error: " + what + " " + extra);
mMediaPlayer.reset(); mMediaPlayer.reset();
Song song = getSong(+1); Song song = getSong(+1);
if (song != null && !song.populate(true)) if (song != null && !song.query(true))
setFlag(FLAG_NO_MEDIA); setFlag(FLAG_NO_MEDIA);
else else
mHandler.sendEmptyMessage(TRACK_CHANGED); mHandler.sendEmptyMessage(TRACK_CHANGED);

2
src/org/kreed/vanilla/Song.java
View File

@ -135,7 +135,7 @@ public class Song implements Parcelable {
* @param force Query even if fields have already been populated * @param force Query even if fields have already been populated
* @return true if fields have been populated, false otherwise * @return true if fields have been populated, false otherwise
*/ */
public boolean populate(boolean force) public boolean query(boolean force)
{ {
if (path != null && !force) if (path != null && !force)
return true; return true;

4
src/org/kreed/vanilla/SongTimeline.java
View File

@ -318,9 +318,9 @@ public final class SongTimeline {
} }
} }
if (!song.populate(false)) { if (!song.query(false)) {
song.randomize(); song.randomize();
if (!song.populate(false)) if (!song.query(false))
return null; return null;
} }