tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #162 from Materight/queue_time

Browse source 
Queue total time (issue #157)
This commit is contained in:
Lincoln 2017-06-05 23:25:13 -04:00 • committed by GitHub
commit e553a64c80
4 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java
View file

@ -239,6 +239,13 @@ public class MusicPlayerRemote {
return -1;
}
public static int getQueueDurationMillis(int position) {
if (musicService != null) {
return musicService.getQueueDurationMillis(position);
}
return -1;
}
public static int seekTo(int millis) {
if (musicService != null) {
return musicService.seek(millis);

7
app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
View file

@ -946,6 +946,13 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
return playback.duration();
}
public int getQueueDurationMillis(int position) {
int ret=0;
for(int i=position+1;i<playingQueue.size();i++)
ret+=playingQueue.get(i).duration;
return ret;
}
public int seek(int millis) {
synchronized (this) {
try {

2
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java
View file

@ -198,6 +198,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
private void updateQueue() {
playingQueueAdapter.swapDataSet(MusicPlayerRemote.getPlayingQueue(), MusicPlayerRemote.getPosition());
playerQueueSubHeader.setText(getResources().getString(R.string.up_next)+" • "+ MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis( MusicPlayerRemote.getPosition())));
if (slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
resetToCurrentPosition();
}
@ -205,6 +206,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
private void updateQueuePosition() {
playingQueueAdapter.setCurrent(MusicPlayerRemote.getPosition());
playerQueueSubHeader.setText(getResources().getString(R.string.up_next)+" • "+ MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis( MusicPlayerRemote.getPosition())));
if (slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
resetToCurrentPosition();
}

2
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
View file

@ -194,6 +194,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
private void updateQueue() {
playingQueueAdapter.swapDataSet(MusicPlayerRemote.getPlayingQueue(), MusicPlayerRemote.getPosition());
playerQueueSubHeader.setText(getResources().getString(R.string.up_next)+" • "+ MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis( MusicPlayerRemote.getPosition())));
if (slidingUpPanelLayout == null || slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
resetToCurrentPosition();
}
@ -201,6 +202,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
private void updateQueuePosition() {
playingQueueAdapter.setCurrent(MusicPlayerRemote.getPosition());
playerQueueSubHeader.setText(getResources().getString(R.string.up_next)+" • "+ MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis( MusicPlayerRemote.getPosition())));
if (slidingUpPanelLayout == null || slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
resetToCurrentPosition();
}