nutomic/controldna
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed playback stopping after first track of new playlist, fixed notification not showing.

Browse source
This commit is contained in:
Felix Ableitner 2014-02-22 02:00:11 +01:00
parent b06d889c10
commit 6cab4b4d32
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/com/github/nutomic/controldlna/mediarouter/MediaRouterPlayService.java
View file

@ -394,7 +394,8 @@ public class MediaRouterPlayService extends Service {
status.getPlaybackState() != MediaItemStatus.PLAYBACK_STATE_PLAYING) status.getPlaybackState() != MediaItemStatus.PLAYBACK_STATE_PLAYING)
stopForeground(true); stopForeground(true);
if (status.getPlaybackState() == MediaItemStatus.PLAYBACK_STATE_FINISHED) if (status.getPlaybackState() == MediaItemStatus.PLAYBACK_STATE_FINISHED ||
status.getPlaybackState() == MediaItemStatus.PLAYBACK_STATE_CANCELED)
playNext(); playNext();
} }
}); });

10
src/com/github/nutomic/controldlna/upnp/RemotePlayServiceBinder.java
View file

@ -73,8 +73,6 @@ public class RemotePlayServiceBinder extends IRemotePlayService.Stub {
private int mPlaybackState; private int mPlaybackState;
private boolean mManuallyStopped;
SubscriptionCallback mSubscriptionCallback; SubscriptionCallback mSubscriptionCallback;
private RemotePlayService mRps; private RemotePlayService mRps;
@ -134,12 +132,7 @@ public class RemotePlayServiceBinder extends IRemotePlayService.Stub {
mPlaybackState = MediaItemStatus.PLAYBACK_STATE_PAUSED; mPlaybackState = MediaItemStatus.PLAYBACK_STATE_PAUSED;
break; break;
case STOPPED: case STOPPED:
if (mManuallyStopped) { mPlaybackState = MediaItemStatus.PLAYBACK_STATE_FINISHED;
mManuallyStopped = false;
mPlaybackState = MediaItemStatus.PLAYBACK_STATE_CANCELED;
}
else
mPlaybackState = MediaItemStatus.PLAYBACK_STATE_FINISHED;
break; break;
case TRANSITIONING: case TRANSITIONING:
mPlaybackState = MediaItemStatus.PLAYBACK_STATE_PENDING; mPlaybackState = MediaItemStatus.PLAYBACK_STATE_PENDING;
@ -291,7 +284,6 @@ public class RemotePlayServiceBinder extends IRemotePlayService.Stub {
*/ */
@Override @Override
public void stop(String sessionId) throws RemoteException { public void stop(String sessionId) throws RemoteException {
mManuallyStopped = true;
mRps.mUpnpService.getControlPoint().execute( mRps.mUpnpService.getControlPoint().execute(
new Stop(mRps.getService(mRps.mDevices.get(sessionId), "AVTransport")) { new Stop(mRps.getService(mRps.mDevices.get(sessionId), "AVTransport")) {