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

Combine getAllSongIds and getAllSongsIdsWith

Browse Source
This commit is contained in:
Christopher Eby 2010-04-11 00:19:13 -05:00
parent f69001aa46
commit b98b107499
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,15 +98,26 @@ public class Song implements Parcelable {
} }
} }
public static long[] getAllSongIds(String selection) public static long[] getAllSongIdsWith(int type, long id)
{ {
if (type == 3)
return new long[] { id };
String selection = "=" + id + " AND " + MediaStore.Audio.Media.IS_MUSIC + "!=0";
switch (type) {
case 2:
selection = MediaStore.Audio.Media.ALBUM_ID + selection;
break;
case 1:
selection = MediaStore.Audio.Media.ARTIST_ID + selection;
break;
default:
return null;
}
Uri media = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI; Uri media = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
String[] projection = { MediaStore.Audio.Media._ID }; String[] projection = { MediaStore.Audio.Media._ID };
String isMusic = MediaStore.Audio.Media.IS_MUSIC + "!=0";
if (selection == null)
selection = isMusic;
else
selection += " AND " + isMusic;
ContentResolver resolver = ContextApplication.getContext().getContentResolver(); ContentResolver resolver = ContextApplication.getContext().getContentResolver();
Cursor cursor = resolver.query(media, projection, selection, null, null); Cursor cursor = resolver.query(media, projection, selection, null, null);
@ -128,20 +139,6 @@ public class Song implements Parcelable {
cursor.close(); cursor.close();
return songs; return songs;
} }
public static long[] getAllSongIdsWith(int type, long id)
{
switch (type) {
case 3:
return new long[] { id };
case 2:
return Song.getAllSongIds(MediaStore.Audio.Media.ALBUM_ID + '=' + id);
case 1:
return Song.getAllSongIds(MediaStore.Audio.Media.ARTIST_ID + '=' + id);
default:
return null;
}
}
public void randomize() public void randomize()
{ {