aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-09-08 17:20:27 -0700
committerScott Jackson <daneren2005@gmail.com>2014-09-08 17:20:27 -0700
commit395fbb400cf260ae51cc240e99d2b9080334d459 (patch)
treebf6001f146b942a48403c27a458ffc1bd872a480 /src
parente6b6786d0e77bef765c3fb21790cea4fc2c27026 (diff)
downloaddsub-395fbb400cf260ae51cc240e99d2b9080334d459.tar.gz
dsub-395fbb400cf260ae51cc240e99d2b9080334d459.tar.bz2
dsub-395fbb400cf260ae51cc240e99d2b9080334d459.zip
Fix web commits for playNow passing on playlist suggestion
Diffstat (limited to 'src')
-rw-r--r--src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java2
-rw-r--r--src/github/daneren2005/dsub/fragments/SubsonicFragment.java9
2 files changed, 7 insertions, 4 deletions
diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index 149e1cb5..0d9c2025 100644
--- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -358,7 +358,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
songs.add((MusicDirectory.Entry) it.next());
}
- ssongs);
+ playNow(songs);
return true;
}
diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
index 7628b687..8918baee 100644
--- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -1375,7 +1375,10 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
return gestureScanner;
}
- protected void playBookmark(final List<Entry> songs, final Entry song) {
+ protected void playBookmark(List<Entry> songs, Entry song) {
+ playBookmark(songs, song, null, null);
+ }
+ protected void playBookmark(final List<Entry> songs, final Entry song, final String playlistName, final String playlistId) {
final Integer position = song.getBookmark().getPosition();
AlertDialog.Builder builder = new AlertDialog.Builder(context);
@@ -1444,12 +1447,12 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
playBookmark(entries, bookmark, playlistName, playlistId);
}
}
- protected void playNow(List<Entry> entries int position) {
+ protected void playNow(List<Entry> entries, int position) {
playNow(entries, position, null, null);
}
protected void playNow(List<Entry> entries, int position, String playlistName, String playlistId) {
Entry selected = entries.isEmpty() ? null : entries.get(0);
- playNow(entries, selected, position, playlistName, playlistID);
+ playNow(entries, selected, position, playlistName, playlistId);
}
protected void playNow(List<Entry> entries, Entry song, int position) {
playNow(entries, song, position, null, null);