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

small changes to music service

Browse source
This commit is contained in:
dkanada 2020-05-05 17:38:09 +09:00
commit 7a3aa73cbe
1 changed files with 4 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,6 @@ import com.kabouzeid.gramophone.widgets.AppWidgetCard;
import com.kabouzeid.gramophone.widgets.AppWidgetClassic; import com.kabouzeid.gramophone.widgets.AppWidgetClassic;
import com.kabouzeid.gramophone.glide.BlurTransformation; import com.kabouzeid.gramophone.glide.BlurTransformation;
import com.kabouzeid.gramophone.helper.ShuffleHelper; import com.kabouzeid.gramophone.helper.ShuffleHelper;
import com.kabouzeid.gramophone.helper.StopWatch;
import com.kabouzeid.gramophone.model.Playlist; import com.kabouzeid.gramophone.model.Playlist;
import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.provider.QueueStore; import com.kabouzeid.gramophone.provider.QueueStore;
@ -149,7 +148,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private QueueSaveHandler queueSaveHandler; private QueueSaveHandler queueSaveHandler;
private HandlerThread musicPlayerHandlerThread; private HandlerThread musicPlayerHandlerThread;
private HandlerThread queueSaveHandlerThread; private HandlerThread queueSaveHandlerThread;
private SongPlayCountHelper songPlayCountHelper = new SongPlayCountHelper();
private ThrottledSeekHandler throttledSeekHandler; private ThrottledSeekHandler throttledSeekHandler;
private boolean becomingNoisyReceiverRegistered; private boolean becomingNoisyReceiverRegistered;
private IntentFilter becomingNoisyReceiverIntentFilter = new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY); private IntentFilter becomingNoisyReceiverIntentFilter = new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
@ -1062,19 +1060,12 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
if (!isPlaying && getSongProgressMillis() > 0) { if (!isPlaying && getSongProgressMillis() > 0) {
savePositionInTrack(); savePositionInTrack();
} }
songPlayCountHelper.notifyPlayStateChanged(isPlaying);
break; break;
case META_CHANGED: case META_CHANGED:
updateNotification(); updateNotification();
updateMediaSessionMetaData(); updateMediaSessionMetaData();
savePosition(); savePosition();
savePositionInTrack(); savePositionInTrack();
final Song currentSong = getCurrentSong();
//HistoryStore.getInstance(this).addSongId(currentSong.id);
if (songPlayCountHelper.shouldBumpPlayCount()) {
//SongPlayCountStore.getInstance(this).bumpPlayCount(songPlayCountHelper.getSong().id);
}
songPlayCountHelper.notifySongChanged(currentSong);
break; break;
case QUEUE_CHANGED: case QUEUE_CHANGED:
// because playing queue size might have changed // because playing queue size might have changed
@ -1288,20 +1279,17 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
final int[] ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS); final int[] ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
switch (command) { switch (command) {
case AppWidgetClassic.NAME: { case AppWidgetClassic.NAME:
appWidgetClassic.performUpdate(MusicService.this, ids); appWidgetClassic.performUpdate(MusicService.this, ids);
break; break;
} case AppWidgetAlbum.NAME:
case AppWidgetAlbum.NAME: {
appWidgetAlbum.performUpdate(MusicService.this, ids); appWidgetAlbum.performUpdate(MusicService.this, ids);
break; break;
} case AppWidgetCard.NAME:
case AppWidgetCard.NAME: {
appWidgetCard.performUpdate(MusicService.this, ids); appWidgetCard.performUpdate(MusicService.this, ids);
break; break;
} }
} }
}
}; };
private class MediaStoreObserver extends ContentObserver implements Runnable { private class MediaStoreObserver extends ContentObserver implements Runnable {
@ -1332,7 +1320,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
} }
private class ThrottledSeekHandler implements Runnable { private class ThrottledSeekHandler implements Runnable {
// milliseconds to throttle before calling run() to aggregate events // milliseconds to throttle before calling run to aggregate events
private static final long THROTTLE = 500; private static final long THROTTLE = 500;
private Handler mHandler; private Handler mHandler;
@ -1351,36 +1339,4 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
sendPublicIntent(PLAY_STATE_CHANGED); sendPublicIntent(PLAY_STATE_CHANGED);
} }
} }
private static class SongPlayCountHelper {
public static final String TAG = SongPlayCountHelper.class.getSimpleName();
private StopWatch stopWatch = new StopWatch();
private Song song = Song.EMPTY_SONG;
public Song getSong() {
return song;
}
boolean shouldBumpPlayCount() {
return song.duration * 0.5d < stopWatch.getElapsedTime();
}
void notifySongChanged(Song song) {
synchronized (this) {
stopWatch.reset();
this.song = song;
}
}
void notifyPlayStateChanged(boolean isPlaying) {
synchronized (this) {
if (isPlaying) {
stopWatch.start();
} else {
stopWatch.pause();
}
}
}
}
} }