Skip to content
Snippets Groups Projects
Commit b4afa4ed authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Revert "Prevent loading last playlist when history is disabled"

This reverts commit 4d50e0c4.
parent 05b5c3c4
No related branches found
No related tags found
1 merge request!1509New audio and video play queue settings
......@@ -41,7 +41,6 @@ import org.videolan.medialibrary.interfaces.Medialibrary
import org.videolan.medialibrary.interfaces.media.MediaWrapper
import org.videolan.resources.*
import org.videolan.resources.util.getFromMl
import org.videolan.tools.PLAYBACK_HISTORY
import org.videolan.tools.Settings
import org.videolan.tools.removeQuery
import org.videolan.tools.retrieveParent
......@@ -62,14 +61,14 @@ internal class MediaSessionCallback(private val playbackService: PlaybackService
override fun onPlay() {
if (playbackService.hasMedia()) playbackService.play()
else if (!AndroidDevices.isAndroidTv && Settings.getInstance(playbackService).getBoolean(PLAYBACK_HISTORY, true)) PlaybackService.loadLastAudio(playbackService)
else if (!AndroidDevices.isAndroidTv) PlaybackService.loadLastAudio(playbackService)
}
override fun onMediaButtonEvent(mediaButtonEvent: Intent): Boolean {
val keyEvent = mediaButtonEvent.getParcelableExtra(Intent.EXTRA_KEY_EVENT) as KeyEvent? ?: return false
if (!playbackService.hasMedia()
&& (keyEvent.keyCode == KeyEvent.KEYCODE_MEDIA_PLAY || keyEvent.keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)) {
return if (keyEvent.action == KeyEvent.ACTION_DOWN && Settings.getInstance(playbackService).getBoolean(PLAYBACK_HISTORY, true)) {
return if (keyEvent.action == KeyEvent.ACTION_DOWN) {
PlaybackService.loadLastAudio(playbackService)
true
} else false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment