wbrawner/Simple-Music-Player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix a glitch at removing the currently playing song from playlist

Browse source
This commit is contained in:
tibbi 2018-09-10 23:46:11 +02:00
parent ae0d7aaf81
commit 444f4685a1
4 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View file

@ -117,6 +117,7 @@
<action android:name="com.simplemobiletools.musicplayer.action.SET_PROGRESS"/>
<action android:name="com.simplemobiletools.musicplayer.action.SKIP_BACKWARD"/>
<action android:name="com.simplemobiletools.musicplayer.action.SKIP_FORWARD"/>
<action android:name="com.simplemobiletools.musicplayer.action.REMOVE_CURRENT_SONG"/>
</intent-filter>
</service>

6
app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/SongAdapter.kt
View file

@ -246,7 +246,11 @@ class SongAdapter(activity: SimpleActivity, var songs: ArrayList<Song>, val list
paths.add(song.path)
removeSongs.add(song)
if (song == MusicService.mCurrSong) {
activity.sendIntent(NEXT)
if (songs.size == removeSongs.size) {
activity.sendIntent(REMOVE_CURRENT_SONG)
} else {
activity.sendIntent(NEXT)
}
}
}

1
app/src/main/kotlin/com/simplemobiletools/musicplayer/helpers/Constants.kt
View file

@ -24,6 +24,7 @@ const val SET_PROGRESS = PATH + "SET_PROGRESS"
const val SET_EQUALIZER = PATH + "SET_EQUALIZER"
const val SKIP_BACKWARD = PATH + "SKIP_BACKWARD"
const val SKIP_FORWARD = PATH + "SKIP_FORWARD"
const val REMOVE_CURRENT_SONG = PATH + "REMOVE_CURRENT_SONG"
// shared preferences
const val SHUFFLE = "shuffle"

6
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/MusicService.kt
View file

@ -220,6 +220,12 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
}
SKIP_BACKWARD -> skipBackward()
SKIP_FORWARD -> skipForward()
REMOVE_CURRENT_SONG -> {
pauseSong()
mCurrSong = null
songChanged(null)
setupNotification()
}
}
return START_NOT_STICKY