third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-16 01:10:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Further attempts to improve reliability of lockscreen controls

Browse Source
This commit is contained in:
Joshua Bahnsen 2013-12-31 00:28:19 -07:00
parent 0881c918be
commit be1f907024
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java
View File

@ -1429,6 +1429,8 @@ public class DownloadServiceImpl extends Service implements DownloadService
{
if (remoteControlClient == null)
{
Log.i(TAG, "In updateRemoteControl, setting up remote control");
Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON);
intent.setComponent(new ComponentName(this.getPackageName(), MediaButtonIntentReceiver.class.getName()));
remoteControlClient = new RemoteControlClient(PendingIntent.getBroadcast(this, 0, intent, 0));
@ -1439,9 +1441,11 @@ public class DownloadServiceImpl extends Service implements DownloadService
RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS |
RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE |
RemoteControlClient.FLAG_KEY_MEDIA_STOP);
audioManager.registerRemoteControlClient(remoteControlClient);
}
audioManager.registerRemoteControlClient(remoteControlClient);
Log.i(TAG, String.format("In updateRemoteControl, playerState: %s", playerState));
switch (playerState)
{
@ -1451,15 +1455,16 @@ public class DownloadServiceImpl extends Service implements DownloadService
case PAUSED:
remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_PAUSED);
break;
case DOWNLOADING:
case PREPARING:
remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_BUFFERING);
break;
case IDLE:
case COMPLETED:
case STOPPED:
remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_STOPPED);
break;
case DOWNLOADING:
case PREPARED:
case PREPARING:
case STOPPED:
default:
remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_STOPPED);
break;
}
@ -1731,7 +1736,7 @@ public class DownloadServiceImpl extends Service implements DownloadService
if (!isPartial || (downloadFile.isWorkDone() && (Math.abs(duration - pos) < 10000)))
{
if (nextPlaying != null && nextPlayerState == PlayerState.PREPARED)
if (Util.getGaplessPlaybackPreference(DownloadServiceImpl.this) && nextPlaying != null && nextPlayerState == PlayerState.PREPARED)
{
if (!nextSetup)
{