diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-01-09 19:32:13 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-01-09 19:32:13 -0800 |
| commit | a128a18fea312abfb3b046d895a2f491cf559003 (patch) | |
| tree | 6a87c3378cc2196033a1887e0a0ad15278d7dd51 | |
| parent | f29e410bf704029afd0f6927fdb530f72e038c96 (diff) | |
| download | dsub-a128a18fea312abfb3b046d895a2f491cf559003.tar.gz dsub-a128a18fea312abfb3b046d895a2f491cf559003.tar.bz2 dsub-a128a18fea312abfb3b046d895a2f491cf559003.zip | |
Added details option to videos
4 files changed, 14 insertions, 11 deletions
diff --git a/subsonic-android/res/menu/select_video_context.xml b/subsonic-android/res/menu/select_video_context.xml index ccc1600d..7a45d34a 100644 --- a/subsonic-android/res/menu/select_video_context.xml +++ b/subsonic-android/res/menu/select_video_context.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/song_menu_info" + android:title="@string/common.info"/> + <item android:id="@+id/song_menu_stream_external" android:title="@string/common.stream_external"/> @@ -19,15 +23,6 @@ /> <item - android:id="@+id/song_menu_pin" - android:title="@string/common.pin" - /> - - <item android:id="@+id/song_menu_delete" android:title="@string/common.delete"/> - - <item - android:id="@+id/song_menu_star" - android:title="@string/common.star"/> </menu> diff --git a/subsonic-android/res/menu/select_video_context_offline.xml b/subsonic-android/res/menu/select_video_context_offline.xml index 4aec257f..fc354119 100644 --- a/subsonic-android/res/menu/select_video_context_offline.xml +++ b/subsonic-android/res/menu/select_video_context_offline.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/song_menu_info" + android:title="@string/common.info"/> + <item android:id="@+id/song_menu_play_external" android:title="@string/common.play_external"/> diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java index 9ddaecf3..be6ce059 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java @@ -262,7 +262,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity { inflater.inflate(R.menu.select_video_context, menu); } - if (!Util.isOffline(this)) { + if (!Util.isOffline(this) && !entry.isVideo()) { 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); } } diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java index 75c03be0..054e054d 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java @@ -503,7 +503,11 @@ public class SubsonicTabActivity extends SherlockActivity { }
public void displaySongInfo(final MusicDirectory.Entry song) {
- String msg = "Artist: " + song.getArtist() + "\nAlbum: " + song.getAlbum();
+
+ String msg = "";
+ if(!song.isVideo()) {
+ msg += "Artist: " + song.getArtist() + "\nAlbum: " + song.getAlbum();
+ }
if(song.getGenre() != null && !song.getGenre().isEmpty()) {
msg += "\nGenre: " + song.getGenre();
}
|