aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/src/github/daneren2005
diff options
context:
space:
mode:
authorowner <owner@DeeDee-Laptop>2012-11-21 23:13:43 -0800
committerowner <owner@DeeDee-Laptop>2012-11-21 23:13:43 -0800
commitdf87756cd3330be032671ff8cb694395cebe1457 (patch)
tree3eafe13a5d1ba35b08a9531e0e1038cd17994da9 /subsonic-android/src/github/daneren2005
parentd638f35850ab86304d39373121f4d512abbbcfdc (diff)
downloaddsub-df87756cd3330be032671ff8cb694395cebe1457.tar.gz
dsub-df87756cd3330be032671ff8cb694395cebe1457.tar.bz2
dsub-df87756cd3330be032671ff8cb694395cebe1457.zip
Added special context menu for videos
Diffstat (limited to 'subsonic-android/src/github/daneren2005')
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
index ccd5d5af..2d87c263 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
@@ -222,13 +222,19 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
inflater.inflate(R.menu.select_album_context_offline, menu);
else
inflater.inflate(R.menu.select_album_context, menu);
- } else {
+ } else if(!entry.isVideo()) {
MenuInflater inflater = getMenuInflater();
if(Util.isOffline(this))
inflater.inflate(R.menu.select_song_context_offline, menu);
else
inflater.inflate(R.menu.select_song_context, menu);
- }
+ } else {
+ MenuInflater inflater = getMenuInflater();
+ if(Util.isOffline(this))
+ inflater.inflate(R.menu.select_video_context_offline, menu);
+ else
+ inflater.inflate(R.menu.select_video_context, menu);
+ }
if (!Util.isOffline(this)) {
menu.findItem(entry.isDirectory() ? R.id.album_menu_star : R.id.song_menu_star).setTitle(entry.isStarred() ? R.string.common_unstar : R.string.common_star);
@@ -284,6 +290,9 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
case R.id.song_menu_star:
toggleStarred(entry);
break;
+ case R.id.song_menu_webview:
+ playVideo(entry);
+ break;
default:
return super.onContextItemSelected(menuItem);
}
@@ -486,7 +495,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
private void playVideo(MusicDirectory.Entry entry) {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(MusicServiceFactory.getMusicService(this).getVideoUrl(this, entry.getId())));
-
+
startActivity(intent);
}